Merge pull request #2080 from tractorcow/3.1-mediadialog-overwrite-hack

BUG Temporarily disable overwrite warning on HtmlEditorField "insert media".
This commit is contained in:
Ingo Schommer 2013-06-11 00:11:39 -07:00
commit a643f95796

View File

@ -426,6 +426,8 @@ class HtmlEditorField_Toolbar extends RequestHandler {
$computerUploadField->removeExtraClass('ss-uploadfield');
$computerUploadField->setTemplate('HtmlEditorField_UploadField');
$computerUploadField->setFolderName(Config::inst()->get('Upload', 'uploads_folder'));
// @todo - Remove this once this field supports display and recovery of file upload validation errors
$computerUploadField->setOverwriteWarning(false);
$tabSet = new TabSet(
"MediaFormInsertMediaTabs",