Import Magento Release 1.7.0.2

OpenMage · Jul 9, 2012 · 6ea22c9 · 6ea22c9
1 parent 44407a7
commit 6ea22c9
Show file tree

Hide file tree

Showing 7 changed files with 724 additions and 13 deletions.
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
@@ -1,3 +1,11 @@
+==== 1.7.0.2 ====
+
+=== Fixes ===
+Fixed: Security vulnerability in Zend_XmlRpc - http://framework.zend.com/security/advisory/ZF2012-01 
+Fixed: PayPal Standard does not display on frontend during checkout with some merchant countries
+
+
+
 ==== 1.7.0.1 ====
 
 === Major Highlights ===

diff --git a/app/Mage.php b/app/Mage.php
@@ -170,7 +170,7 @@ public static function getVersionInfo()
             'major'     => '1',
             'minor'     => '7',
             'revision'  => '0',
-            'patch'     => '1',
+            'patch'     => '2',
             'stability' => '',
             'number'    => '',
         );

diff --git a/app/code/core/Mage/Paypal/Model/Config.php b/app/code/core/Mage/Paypal/Model/Config.php
@@ -516,37 +516,44 @@ public function getCountryMethods($countryCode = null)
                 self::METHOD_WPP_PE_EXPRESS,
             ),
             'AU' => array(
+                self::METHOD_WPS,
                 self::METHOD_PAYFLOWPRO,
                 self::METHOD_HOSTEDPRO,
                 self::METHOD_WPP_EXPRESS,
                 self::METHOD_BILLING_AGREEMENT,
             ),
             'NZ' => array(
+                self::METHOD_WPS,
                 self::METHOD_PAYFLOWPRO,
                 self::METHOD_WPP_EXPRESS,
                 self::METHOD_BILLING_AGREEMENT,
             ),
             'JP' => array(
+                self::METHOD_WPS,
                 self::METHOD_HOSTEDPRO,
                 self::METHOD_WPP_EXPRESS,
                 self::METHOD_BILLING_AGREEMENT,
             ),
             'FR' => array(
+                self::METHOD_WPS,
                 self::METHOD_HOSTEDPRO,
                 self::METHOD_WPP_EXPRESS,
                 self::METHOD_BILLING_AGREEMENT,
             ),
             'IT' => array(
+                self::METHOD_WPS,
                 self::METHOD_HOSTEDPRO,
                 self::METHOD_WPP_EXPRESS,
                 self::METHOD_BILLING_AGREEMENT,
             ),
             'ES' => array(
+                self::METHOD_WPS,
                 self::METHOD_HOSTEDPRO,
                 self::METHOD_WPP_EXPRESS,
                 self::METHOD_BILLING_AGREEMENT,
             ),
             'HK' => array(
+                self::METHOD_WPS,
                 self::METHOD_HOSTEDPRO,
                 self::METHOD_WPP_EXPRESS,
                 self::METHOD_BILLING_AGREEMENT,