Import Magento Release 1.5.0.1

winman · Feb 10, 2011 · 22c7660 · 22c7660
1 parent 88e2a6b
commit 22c7660
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 178 deletions.
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
@@ -1,3 +1,8 @@
+==== 1.5.0.1 =====
+
+=== Major Highlights ===
+Due to a design flaw we are removing alternative image storage feature from this release. It will be redesigned and released in our upcoming releases
+
 ==== 1.5.0.0 =====
 
 === Major Highlights ===

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

diff --git a/app/code/core/Mage/Core/Helper/File/Storage/Database.php b/app/code/core/Mage/Core/Helper/File/Storage/Database.php
@@ -54,11 +54,13 @@ class Mage_Core_Helper_File_Storage_Database extends Mage_Core_Helper_Abstract
 
     /**
      * Check if we use DB storage
+     * Note: Disabled as not completed feature
      *
      * @return bool
      */
     public function checkDbUsage()
     {
+        return false;
         if (is_null($this->_useDb)) {
             $currentStorage = (int) Mage::app()
                 ->getConfig()->getNode(Mage_Core_Model_File_Storage::XML_PATH_STORAGE_MEDIA);

diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml
@@ -832,6 +832,7 @@
                         </return_path_email>
                     </fields>
                 </smtp>
+                <!-- DISABLED AS NOT COMPLETED FEATURE. DO NOT ENABLE IT
                 <media_storage_configuration translate="label" module="core">
                     <label>Storage Configuration for Media</label>
                     <frontend_type>text</frontend_type>
@@ -873,7 +874,7 @@
                                 automatically placed to the selected media storage.</comment>
                         </synchronize>
                     </fields>
-                </media_storage_configuration>
+                </media_storage_configuration> -->
             </groups>
         </system>
         <admin translate="label" module="core">

diff --git a/downloader/Maged/Controller.php b/downloader/Maged/Controller.php
@@ -935,7 +935,7 @@ public static function getVersionInfo()
             'major'     => '1',
             'minor'     => '5',
             'revision'  => '0',
-            'patch'     => '0',
+            'patch'     => '1',
             'stability' => '',
             'number'    => '',
         );

diff --git a/get.php b/get.php
diff --git a/media/.htaccess b/media/.htaccess
@@ -5,22 +5,3 @@ php_flag engine 0
 
 AddHandler cgi-script .php .pl .py .jsp .asp .htm .shtml .sh .cgi
 Options -ExecCGI
-<IfModule mod_rewrite.c>
-
-############################################
-## enable rewrites
-
-    Options +FollowSymLinks
-    RewriteEngine on
-
-    #RewriteCond %{REQUEST_URI} !^/(media|skin|js)/
-
-############################################
-## never rewrite for existing files
-    RewriteCond %{REQUEST_FILENAME} !-f
-
-############################################
-## rewrite everything else to index.php
-
-    RewriteRule .* ../get.php [L]
-</IfModule>
diff --git a/var/package/Mage_All_Latest-1.5.0.0.xml b/var/package/Mage_All_Latest-1.5.0.0.xml
diff --git a/var/package/Mage_Core_Modules-1.5.0.0.xml b/var/package/Mage_Core_Modules-1.5.0.0.xml