Update flow.js, remove fusty-flow.js, fix upload_max_filesize=0 bug, …

…fix translation
OpenMage · Aug 16, 2022 · 9cc750f · 9cc750f
1 parent 71998f5
commit 9cc750f
Show file tree

Hide file tree

Showing 8 changed files with 1,679 additions and 455 deletions.
diff --git a/app/code/core/Mage/Catalog/Helper/Image.php b/app/code/core/Mage/Catalog/Helper/Image.php
@@ -637,7 +637,7 @@ public function validateUploadFile($filePath)
         }
 
         if ($imageInfo[0] > $maxDimension || $imageInfo[1] > $maxDimension) {
-            Mage::throwException($this->__('Disalollowed file format.'));
+            Mage::throwException($this->__('Disallowed file format.'));
         }
 
         $_processor = new Varien_Image($filePath);

diff --git a/app/design/adminhtml/default/default/layout/main.xml b/app/design/adminhtml/default/default/layout/main.xml
@@ -158,8 +158,6 @@ Layout for editor element
             <action method="addJs"><script>mage/adminhtml/variables.js</script></action>
             <action method="addJs"><script>mage/adminhtml/wysiwyg/widget.js</script></action>
             <action method="addJs"><name>lib/uploader/flow.min.js</name></action>
-            <action method="addJs"><name>lib/uploader/fusty-flow.js</name></action>
-            <action method="addJs"><name>lib/uploader/fusty-flow-factory.js</name></action>
             <action method="addJs"><name>mage/adminhtml/uploader/instance.js</name></action>
             <action method="addJs"><script>mage/adminhtml/browser.js</script></action>
             <action method="addJs"><script>prototype/window.js</script></action>

diff --git a/app/locale/en_US/Mage_Catalog.csv b/app/locale/en_US/Mage_Catalog.csv
@@ -258,7 +258,7 @@
 "Details","Details"
 "Disabled","Disabled"
 "Disallowed file type.","Disallowed file type."
-"Disalollowed file format.","Disalollowed file format."
+"Disallowed file format.","Disallowed file format."
 "Display Actual Price","Display Actual Price"
 "Display Page Control","Display Page Control"
 "Display Price Interval as One Price","Display Price Interval as One Price"