Fix 1.9.3.x upstream merges

The upstream merges for some 1.9.3.x releases introduced a few inconsistencies: * cms_generate_breadcrumbs event is fired twice * related to the above dd41230 is applied to wrong code block * few locale .csv have now escaped single quote entries along with the entries where those got removed in #46 * #21 got reverted at some point * var/package dir has 5 obsolete xml files * slightly different configuration in Sales, SalesRule and Tax config.xml * Mage_SalesRule_Model_Validator is outdated compared with latest from 1.9.3.7
OpenMage · Mar 9, 2018 · d92a24a · d92a24a
1 parent a313512
commit d92a24a
Show file tree

Hide file tree

Showing 9 changed files with 198 additions and 206 deletions.
diff --git a/app/code/core/Mage/Cms/Block/Page.php b/app/code/core/Mage/Cms/Block/Page.php
@@ -91,8 +91,10 @@ protected function _prepareLayout()
 
             Mage::dispatchEvent('cms_generate_breadcrumbs', array('breadcrumbs' => $breadcrumbsObject));
 
-            foreach ($breadcrumbsObject->getCrumbs() as $breadcrumbsItem) {
-                $breadcrumbs->addCrumb($breadcrumbsItem['crumbName'], $breadcrumbsItem['crumbInfo']);
+            if ($breadcrumbs instanceof Mage_Page_Block_Html_Breadcrumbs) {
+                foreach ($breadcrumbsObject->getCrumbs() as $breadcrumbsItem) {
+                    $breadcrumbs->addCrumb($breadcrumbsItem['crumbName'], $breadcrumbsItem['crumbInfo']);
+                }
             }
         }
 
@@ -108,16 +110,6 @@ protected function _prepareLayout()
             $head->setDescription($page->getMetaDescription());
         }
 
-        $breadcrumbsObject = new Varien_Object();
-        $breadcrumbsObject->setCrumbs($breadcrumbsArray);
-
-        Mage::dispatchEvent('cms_generate_breadcrumbs', array('breadcrumbs' => $breadcrumbsObject));
-
-        if ($breadcrumbs instanceof Mage_Page_Block_Html_Breadcrumbs) {
-            foreach ($breadcrumbsObject->getCrumbs() as $breadcrumbsItem) {
-               $breadcrumbs->addCrumb($breadcrumbsItem['crumbName'], $breadcrumbsItem['crumbInfo']);
-            }
-        }
         return parent::_prepareLayout();
     }
 

diff --git a/app/code/core/Mage/Sales/etc/config.xml b/app/code/core/Mage/Sales/etc/config.xml
@@ -1227,7 +1227,7 @@
                     </grand_total>
                     <msrp>
                         <class>sales/quote_address_total_msrp</class>
-                        <before>weee,freeshipping</before>
+                        <before>grand_total</before>
                     </msrp>
                 </totals>
                 <nominal_totals>

diff --git a/app/code/core/Mage/SalesRule/Model/Validator.php b/app/code/core/Mage/SalesRule/Model/Validator.php
diff --git a/app/code/core/Mage/SalesRule/etc/config.xml b/app/code/core/Mage/SalesRule/etc/config.xml
@@ -134,8 +134,8 @@
                 <totals>
                     <freeshipping>
                         <class>salesrule/quote_freeshipping</class>
-                        <after>subtotal,tax_subtotal</after>
-                        <before>shipping</before>
+                        <after>subtotal</after>
+                        <before>tax_subtotal,shipping</before>
                     </freeshipping>
                     <discount>
                         <class>salesrule/quote_discount</class>

diff --git a/app/code/core/Mage/Tax/etc/config.xml b/app/code/core/Mage/Tax/etc/config.xml
@@ -162,8 +162,8 @@
                 <totals>
                     <tax_subtotal>
                         <class>tax/sales_total_quote_subtotal</class>
-                        <after>subtotal</after>
-                        <before>tax,discount,msrp</before>
+                        <after>subtotal,nominal,shipping,freeshipping</after>
+                        <before>tax,discount</before>
                     </tax_subtotal>
                     <tax_shipping>
                         <class>tax/sales_total_quote_shipping</class>

diff --git a/app/locale/en_US/Mage_Adminhtml.csv b/app/locale/en_US/Mage_Adminhtml.csv
@@ -217,7 +217,6 @@
 "Cannot send shipment information.","Cannot send shipment information."
 "Cannot update item quantity.","Cannot update item quantity."
 "Cannot update the item's quantity.","Cannot update the item's quantity."
-"Cannot update the item\'s quantity.","Cannot update the item\'s quantity."
 "Card Verification Number","Card Verification Number"
 "Catalog","Catalog"
 "Catalog Price Rules","Catalog Price Rules"

diff --git a/app/locale/en_US/Mage_Paypal.csv b/app/locale/en_US/Mage_Paypal.csv
@@ -334,7 +334,6 @@
 "Merchant Protection Eligibility","Merchant Protection Eligibility"
 "Merchant Referral Bonus","Merchant Referral Bonus"
 "Merchant account doesn't have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","Merchant account doesn't have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview."
-"Merchant account doesn\'t have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","Merchant account doesn\'t have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview."
 "Merchant account is not verified.","Merchant account is not verified."
 "Merchant denied this pending payment.","Merchant denied this pending payment."
 "Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","Merchant holds a non-U.S. account and does not have a withdrawal mechanism."
@@ -607,7 +606,6 @@
 "Virtual Terminal Payment","Virtual Terminal Payment"
 "Void","Void"
 "Waiting until Customer's eCheck will be cleared.","Waiting until Customer's eCheck will be cleared."
-"Waiting until Customer\'s eCheck will be cleared.","Waiting until Customer\'s eCheck will be cleared."
 "We prefer PayPal (150 X 40)","We prefer PayPal (150 X 40)"
 "We prefer PayPal (150 X 60)","We prefer PayPal (150 X 60)"
 "Website Payments Plus","Website Payments Plus"

diff --git a/app/locale/en_US/Mage_Review.csv b/app/locale/en_US/Mage_Review.csv
@@ -12,8 +12,6 @@
 "5 stars","5 stars"
 "<a href=""%1$s"" onclick=""this.target='blank'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>","<a href=""%1$s"" onclick=""this.target='blank'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>"
 "<a href=""%1$s"" onclick=""this.target='blank'"">%2$s</a> <a href=""mailto:%3$s"">(%3$s)</a>","<a href=""%1$s"" onclick=""this.target='blank'"">%2$s</a> <a href=""mailto:%3$s"">(%3$s)</a>"
-"<a href=""%1$s"" onclick=""this.target=\'blank\'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>","<a href=""%1$s"" onclick=""this.target=\'blank\'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>"
-"<a href=""%1$s"" onclick=""this.target=\'blank\'"">%2$s</a> <a href=""mailto:%3$s"">(%3$s)</a>","<a href=""%1$s"" onclick=""this.target=\'blank\'"">%2$s</a> <a href=""mailto:%3$s"">(%3$s)</a>"
 "Add New Review","Add New Review"
 "Add Your Review","Add Your Review"
 "Administrator","Administrator"

diff --git a/app/locale/en_US/Mage_Rss.csv b/app/locale/en_US/Mage_Rss.csv
@@ -2,10 +2,9 @@
 "%s - Special Products","%s - Special Products"
 "%s RSS Feed","%s RSS Feed"
 "%s has reached a quantity of %s.","%s has reached a quantity of %s."
-"%s's Wishlist","%s's Wishlist"
-"%s\'s Wishlist","%s\'s Wishlist"
 "Admin Catalog","Admin Catalog"
 "Admin Order","Admin Order"
+"%s's Wishlist","%s's Wishlist"
 "Cannot retrieve the wishlist","Cannot retrieve the wishlist"
 "Catalog","Catalog"
 "Category Feeds","Category Feeds"