Merge pull request #5861 from open-sausages/pulls/4.0/fix-uploadfield…

…-buttons BUG Fix `[buttons]` appearing instead of actual buttons when uploading files
silverstripe · Aug 2, 2016 · 76dd9b3 · 76dd9b3
2 parents 59bba54 + 12adba3
commit 76dd9b3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/forms/UploadField.php b/forms/UploadField.php
@@ -1208,7 +1208,7 @@ protected function encodeFileAttributes(AssetContainer $file) {
 			'edit_url' => $customised->UploadFieldEditLink,
 			'size' => $file->getAbsoluteSize(),
 			'type' => File::get_file_type($file->getFilename()),
-			'buttons' => $customised->UploadFieldFileButtons,
+			'buttons' => (string)$customised->UploadFieldFileButtons,
 			'fieldname' => $this->getName()
 		);
 	}