Skip to content

Commit 33cb066

Browse files
committed
Update flow.js, remove fusty-flow.js, fix upload_max_filesize=0 bug, fix translation
1 parent 71998f5 commit 33cb066

File tree

9 files changed

+1678
-455
lines changed

9 files changed

+1678
-455
lines changed

app/code/core/Mage/Catalog/Helper/Image.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ public function validateUploadFile($filePath)
637637
}
638638

639639
if ($imageInfo[0] > $maxDimension || $imageInfo[1] > $maxDimension) {
640-
Mage::throwException($this->__('Disalollowed file format.'));
640+
Mage::throwException($this->__('Disallowed file format.'));
641641
}
642642

643643
$_processor = new Varien_Image($filePath);

app/code/core/Mage/Uploader/Model/Config/Uploader.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,5 +118,10 @@ protected function _construct()
118118
->setProgressCallbacksInterval(self::PROGRESS_CALLBACK_INTERVAL)
119119
->setSuccessStatuses(array(200, 201, 202))
120120
->setPermanentErrors(array(404, 415, 500, 501));
121+
122+
// If post_max_size or upload_max_filesize are set to 0, unset this property
123+
if (!$this->getChunkSize()) {
124+
$this->unsChunkSize();
125+
}
121126
}
122127
}

app/design/adminhtml/default/default/layout/main.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,6 @@ Layout for editor element
158158
<action method="addJs"><script>mage/adminhtml/variables.js</script></action>
159159
<action method="addJs"><script>mage/adminhtml/wysiwyg/widget.js</script></action>
160160
<action method="addJs"><name>lib/uploader/flow.min.js</name></action>
161-
<action method="addJs"><name>lib/uploader/fusty-flow.js</name></action>
162-
<action method="addJs"><name>lib/uploader/fusty-flow-factory.js</name></action>
163161
<action method="addJs"><name>mage/adminhtml/uploader/instance.js</name></action>
164162
<action method="addJs"><script>mage/adminhtml/browser.js</script></action>
165163
<action method="addJs"><script>prototype/window.js</script></action>

app/locale/en_US/Mage_Catalog.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@
258258
"Details","Details"
259259
"Disabled","Disabled"
260260
"Disallowed file type.","Disallowed file type."
261-
"Disalollowed file format.","Disalollowed file format."
261+
"Disallowed file format.","Disallowed file format."
262262
"Display Actual Price","Display Actual Price"
263263
"Display Page Control","Display Page Control"
264264
"Display Price Interval as One Price","Display Price Interval as One Price"

0 commit comments

Comments
 (0)