Some code alignments between v19 and v20 (#2810)

Author: sreichel

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

@@ -642,7 +642,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);

app/code/core/Mage/CatalogInventory/Model/Stock/Item.php

@@ -168,6 +168,7 @@ protected function _construct()
      */
     protected function _initOldFieldsMap()
     {
+        // pre 1.6 fields names, old => new
         $this->_oldFieldsMap = [
             'stock_status_changed_automatically' => 'stock_status_changed_auto',
             'use_config_enable_qty_increments'   => 'use_config_enable_qty_inc'

app/code/core/Mage/Core/etc/config.xml

@@ -488,7 +488,6 @@
                     <protected>
                         <app>/app/*/*</app>
                         <dev>/dev/*/*</dev>
-                        <downloader>/downloader/*/*</downloader>
                         <errors>/errors/*/*</errors>
                         <includes>/includes/*/*</includes>
                         <js>/js/*/*</js>

app/code/core/Mage/Page/Block/Html/Head.php

@@ -80,6 +80,7 @@ public function addJs($name, $params = "", $referenceName = "*", $before = null)
      * @param string $referenceName
      * @param bool $before
      * @return $this
+     * @deprecated
      */
     public function addCssIe($name, $params = "", $referenceName = "*", $before = null)
     {

app/code/core/Mage/Sales/Model/Order.php

@@ -518,6 +518,7 @@ protected function _construct()
     */
     protected function _initOldFieldsMap()
     {
+        // pre 1.6 fields names, old => new
         $this->_oldFieldsMap = Mage::helper('sales')->getOldFieldMap('order');
         return $this;
     }

app/code/core/Mage/Sales/Model/Order/Address.php

@@ -104,6 +104,7 @@ protected function _construct()
      * Init mapping array of short fields to its full names
      *
      * @return $this
+     * @deprecated
      */
     protected function _initOldFieldsMap()
     {

app/code/core/Mage/Sales/Model/Order/Creditmemo.php

@@ -217,6 +217,7 @@ protected function _construct()
      * Init mapping array of short fields to its full names
      *
      * @return $this
+     * @deprecated
      */
     protected function _initOldFieldsMap()
     {

app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php

@@ -143,6 +143,7 @@ public function setCreditmemo(Mage_Sales_Model_Order_Creditmemo $creditmemo)
      */
     protected function _initOldFieldsMap()
     {
+        // pre 1.6 fields names, old => new
         $this->_oldFieldsMap = Mage::helper('sales')->getOldFieldMap('creditmemo_item');
         return $this;
     }

app/code/core/Mage/Sales/Model/Order/Invoice.php

@@ -212,6 +212,7 @@ protected function _construct()
      * Init mapping array of short fields to its full names
      *
      * @return $this
+     * @deprecated
      */
     protected function _initOldFieldsMap()
     {

app/code/core/Mage/Sales/Model/Order/Invoice/Item.php

@@ -115,6 +115,7 @@ public function _construct()
      */
     protected function _initOldFieldsMap()
     {
+        // pre 1.6 fields names, old => new
         $this->_oldFieldsMap = Mage::helper('sales')->getOldFieldMap('invoice_item');
         return $this;
     }

app/code/core/Mage/Sales/Model/Order/Item.php

@@ -237,9 +237,11 @@ protected function _construct()
      * its full names
      *
      * @return Varien_Object
+     * @deprecated
      */
     protected function _initOldFieldsMap()
     {
+        // pre 1.6 fields names, old => new
         $this->_oldFieldsMap = Mage::helper('sales')->getOldFieldMap('order_item');
         return $this;
     }

app/code/core/Mage/Sales/Model/Order/Shipment.php

@@ -119,6 +119,7 @@ protected function _construct()
      * Init mapping array of short fields to its full names
      *
      * @return $this
+     * @deprecated
      */
     protected function _initOldFieldsMap()
     {

app/code/core/Mage/Sales/Model/Quote.php

@@ -254,6 +254,7 @@ protected function _construct()
      * its full names
      *
      * @return Varien_Object
+     * @deprecated
      */
     protected function _initOldFieldsMap()
     {

app/code/core/Mage/Sales/Model/Quote/Address.php

@@ -314,6 +314,7 @@ protected function _construct()
      * Init mapping array of short fields to its full names
      *
      * @return $this
+     * @deprecated
      */
     protected function _initOldFieldsMap()
     {

app/code/core/Mage/Sales/Model/Quote/Item.php

@@ -236,6 +236,7 @@ protected function _construct()
      * its full names
      *
      * @return $this
+     * @deprecated
      */
     protected function _initOldFieldsMap()
     {

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"

index.php

@@ -29,24 +29,12 @@
     exit;
 }
 
-/**
- * Compilation includes configuration file
- */
 define('MAGENTO_ROOT', getcwd());
 
 $mageFilename = MAGENTO_ROOT . '/app/Mage.php';
 $maintenanceFile = 'maintenance.flag';
 $maintenanceIpFile = 'maintenance.ip';
 
-if (!file_exists($mageFilename)) {
-    if (is_dir('downloader')) {
-        header("Location: downloader");
-    } else {
-        echo $mageFilename . " was not found";
-    }
-    exit;
-}
-
 require MAGENTO_ROOT . '/app/bootstrap.php';
 require_once $mageFilename;