Import Magento 1.4.0.0-rc1

winman · Dec 31, 2009 · 473b844 · 473b844
1 parent 788d81f
commit 473b844
Show file tree

Hide file tree

Showing 1,442 changed files with 29,860 additions and 25,214 deletions.
diff --git a/404/skin/default/images/404.gif b/404/skin/default/images/404.gif
diff --git a/404/skin/default/images/header_top_container_bg.jpg b/404/skin/default/images/header_top_container_bg.jpg
diff --git a/404/skin/default/images/logo.gif b/404/skin/default/images/logo.gif
diff --git a/404/skin/default/index.phtml b/404/skin/default/index.phtml
diff --git a/app/Mage.php b/app/Mage.php
@@ -154,7 +154,7 @@ public static function getVersionInfo()
             'minor'     => '4',
             'revision'  => '0',
             'patch'     => '0',
-            'stability' => 'beta',
+            'stability' => 'rc',
             'number'    => '1',
         );
     }
@@ -599,7 +599,7 @@ public static function run($code = '', $type = 'store', $options=array())
             header('Location: ' . self::getBaseUrl());
             die();
         } catch (Mage_Core_Model_Store_Exception $e) {
-            $baseUrl = rtrim(self::getScriptSystemUrl('404'), '/') . '/404/';
+            $baseUrl = rtrim(self::getScriptSystemUrl('errors'), '/') . '/errors/404.php';
             if (!headers_sent()) {
                 header('Location: ' . $baseUrl);
             } else {
@@ -616,7 +616,7 @@ public static function run($code = '', $type = 'store', $options=array())
             try {
                 self::dispatchEvent('mage_run_exception', array('exception' => $e));
                 if (!headers_sent()) {
-                    header('Location:'.self::getUrl('install'));
+                    header('Location:' . self::getUrl('install'));
                 } else {
                     self::printException($e);
                 }
@@ -788,13 +788,11 @@ public static function printException(Exception $e, $extra = '')
             $storeCode = 'default';
             try {
                 $storeCode = self::app()->getStore()->getCode();
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
             }
 
-            $baseUrl = self::getScriptSystemUrl('report', true);
-            $reportUrl = rtrim($baseUrl, '/') . '/report/?id='
-            . $reportId . '&s=' . $storeCode;
+            $baseUrl = self::getScriptSystemUrl('errors', true);
+            $reportUrl = rtrim($baseUrl, '/') . '/errors/report.php?id=' . $reportId . '&s=' . $storeCode;
 
             if (!headers_sent()) {
                 header('Location: ' . $reportUrl);