Import Magento Release 1.2.0.2

winman · Jan 17, 2009 · 1f631b0 · 1f631b0
1 parent c55a10a
commit 1f631b0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 25 deletions.
diff --git a/app/Mage.php b/app/Mage.php
@@ -82,7 +82,7 @@ final class Mage {
 
     public static function getVersion()
     {
-        return '1.2.0.1';
+        return '1.2.0.2';
     }
 
     /**

diff --git a/app/code/core/Mage/Core/Model/Store.php b/app/code/core/Mage/Core/Model/Store.php
@@ -185,6 +185,9 @@ public function getConfig($path) {
 
         $fullPath = 'stores/'.$this->getCode().'/'.$path;
         $data = $config->getNode($fullPath);
+        if (!$data && !Mage::isInstalled()) {
+            $data = $config->getNode('default/' . $path);
+        }
         if (!$data) {
             return null;
         }
@@ -358,6 +361,7 @@ public function getBaseUrl($type=self::URL_TYPE_LINK, $secure=null)
                 default:
                     throw Mage::exception('Mage_Core', Mage::helper('core')->__('Invalid base url type'));
             }
+
             $this->_baseUrlCache[$cacheKey] = rtrim($url, '/').'/';
         }
 #echo "CACHE: ".$cacheKey.','.$this->_baseUrlCache[$cacheKey].' *** ';

diff --git a/app/etc/config.xml b/app/etc/config.xml
@@ -381,28 +381,4 @@
             </filesystem>
         </system>
     </default>
-
-    <stores>
-        <default>
-            <web>
-                <unsecure>
-                    <base_url>{{base_url}}</base_url>
-                    <base_link_url>{{unsecure_base_url}}</base_link_url>
-                    <base_web_url>{{unsecure_base_url}}</base_web_url>
-                    <base_skin_url>{{unsecure_base_url}}skin/</base_skin_url>
-                    <base_js_url>{{unsecure_base_url}}js/</base_js_url>
-                    <base_media_url>{{unsecure_base_url}}media/</base_media_url>
-                </unsecure>
-
-                <secure>
-                    <base_url>{{base_url}}</base_url>
-                    <base_web_url>{{secure_base_url}}</base_web_url>
-                    <base_link_url>{{secure_base_url}}</base_link_url>
-                    <base_js_url>{{secure_base_url}}js/</base_js_url>
-                    <base_skin_url>{{secure_base_url}}skin/</base_skin_url>
-                    <base_media_url>{{secure_base_url}}media/</base_media_url>
-                </secure>
-            </web>
-        </default>
-    </stores>
 </config>
-Original file line number
+Diff line change
@@ Expand Up / @@ -82,7 +82,7 @@ final class Mage { @@
         public static function getVersion()
         {
-            return '1.2.0.1';
+            return '1.2.0.2';
         }
         /**
@@ Expand Down @@