tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity

ENHANCEMENT: Don't return a blank url when no file is specified

Browse Source
This commit is contained in:
Jean-Fabien Barrios 2010-09-22 02:20:28 +00:00
parent 982ea1cdb1
commit abee24ed0c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/submissions/SubmittedFileField.php
View File

@ -17,7 +17,8 @@ class SubmittedFileField extends SubmittedFormField {
* @return String
*/
function getFormattedValue() {
return '<a href="'.$this->getLink().'">'. _t('SubmittedFileField.DOWNLOADFILE', 'Download File') .'</a>';
$link = $this->getLink();
return (!empty($link)) ? '<a href="'.$link.'">'. _t('SubmittedFileField.DOWNLOADFILE', 'Download File') .'</a>' : '';
}
/**
@ -26,6 +27,10 @@ class SubmittedFileField extends SubmittedFormField {
* @return String
*/
function getLink() {
return ($this->UploadedFile()) ? $this->UploadedFile()->URL : "";
if ($this->UploadedFile()){
// Test if there is a filename, not only a filepath to the assets folder
return ($this->UploadedFile()->getFilename() != ASSETS_DIR.'/') ? $this->UploadedFile()->URL : '';
}
return '';
}
}