diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index af0a71f64c..57657e4fb1 100644 --- 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 index 18a4ff51c9..44e78c1f1f 100644 --- 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 index 47daea099a..546b71658d 100644 --- 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 index c09e98296f..793080cc72 100644 --- a/app/code/core/Mage/Core/etc/system.xml +++ b/app/code/core/Mage/Core/etc/system.xml @@ -832,6 +832,7 @@ + diff --git a/downloader/Maged/Controller.php b/downloader/Maged/Controller.php index 2e41a15324..54e7ed58fe 100755 --- 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 deleted file mode 100644 index 1a692bfde0..0000000000 --- a/get.php +++ /dev/null @@ -1,120 +0,0 @@ -

Whoops, it looks like you have an invalid PHP version.

Magento supports PHP 5.2.0 or newer. Find out how to install Magento using PHP-CGI as a work-around.

'; - exit; -} - -/** - * Error reporting - */ -error_reporting(E_ALL | E_STRICT); -ini_set('display_errors', 1); - -$ds = DIRECTORY_SEPARATOR; -$ps = PATH_SEPARATOR; -$bp = dirname(__FILE__); - -/** - * Set include path - */ - -$paths[] = $bp . $ds . 'app' . $ds . 'code' . $ds . 'local'; -$paths[] = $bp . $ds . 'app' . $ds . 'code' . $ds . 'community'; -$paths[] = $bp . $ds . 'app' . $ds . 'code' . $ds . 'core'; -$paths[] = $bp . $ds . 'lib'; - -$appPath = implode($ps, $paths); -set_include_path($appPath . $ps . get_include_path()); - -include_once 'Mage/Core/functions.php'; -include_once 'Varien/Autoload.php'; - -Varien_Autoload::register(); - -$request = new Zend_Controller_Request_Http(); - -$filePath = rtrim($bp, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . ltrim($request->getPathInfo(), - DIRECTORY_SEPARATOR); - -$scriptFilename = basename(__FILE__); - -$filename = str_replace('/media/', '', $request->getPathInfo()); - -if (file_exists($filePath) && is_readable($filePath)) { - $transfer = new Varien_File_Transfer_Adapter_Http(); - $transfer->send($filePath); - exit; -} - -$mageFilename = 'app/Mage.php'; - -if (!file_exists($mageFilename)) { - echo $mageFilename . ' was not found'; -} - -require_once $mageFilename; - -umask(0); - -/* Store or website code */ -$mageRunCode = isset($_SERVER['MAGE_RUN_CODE']) ? $_SERVER['MAGE_RUN_CODE'] : ''; - -/* Run store or run website */ -$mageRunType = isset($_SERVER['MAGE_RUN_TYPE']) ? $_SERVER['MAGE_RUN_TYPE'] : 'store'; - -Mage::init($mageRunCode, $mageRunType, array(), array('Mage_Core')); - -$databaseFileSotrage = Mage::getModel('core/file_storage_database'); -$databaseFileSotrage->loadByFilename($filename); - -if ($databaseFileSotrage->getId()) { - $directory = dirname($filePath); - if (!is_dir($directory)) { - mkdir($directory, 0777, true); - } - - $fp = fopen($filePath, 'w'); - if (flock($fp, LOCK_EX | LOCK_NB)) { - ftruncate($fp, 0); - fwrite($fp, $databaseFileSotrage->getContent()); - }/* else { - while (!flock($fp, LOCK_EX | LOCK_NB)) { - usleep(1000); - } - }*/ - flock($fp, LOCK_UN); - fclose($fp); -} - -if (file_exists($filePath) || is_readable($filePath)) { - $transfer = new Varien_File_Transfer_Adapter_Http(); - $transfer->send($filePath); - exit; -} - -header('HTTP/1.0 404 Not Found'); diff --git a/media/.htaccess b/media/.htaccess index 15487e19f2..d79b114d13 100644 --- 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 - - -############################################ -## 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] - diff --git a/var/package/Mage_All_Latest-1.5.0.0.xml b/var/package/Mage_All_Latest-1.5.0.0.xml deleted file mode 100644 index 187b1df5fc..0000000000 --- a/var/package/Mage_All_Latest-1.5.0.0.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - Mage_All_Latest - 1.5.0.0 - stable - OSL v3.0 - community - - Metapackage for latest Magento 1.5.0.0 release - Metapackage for latest Magento 1.5.0.0 release - 1.5.0.0 - Magento Core Teamcorecore@magentocommerce.com - 2011-02-08 - - - - 5.2.06.0.0Mage_Core_Modulescommunity1.5.0.01.5.0.0Mage_Core_Adminhtmlcommunity1.5.0.01.5.0.0Interface_Adminhtml_Defaultcommunity1.5.0.01.5.0.0Interface_Frontend_Defaultcommunity1.5.0.01.5.0.0Interface_Install_Defaultcommunity1.5.0.01.5.0.0Mage_Downloadercommunity1.5.0.01.5.0.0Mage_Centinelcommunity1.5.0.01.5.0.0Interface_Frontend_Base_Defaultcommunity1.5.0.01.5.0.0Phoenix_Moneybookerscommunity1.2.41.3Find_Feedcommunity1.0.71.1Mage_Compilercommunity1.5.0.01.5.0.0Magento_Mobilecommunity1.5.0.01.5.1.0 - diff --git a/var/package/Mage_Core_Modules-1.5.0.0.xml b/var/package/Mage_Core_Modules-1.5.0.0.xml deleted file mode 100644 index f1c6e0dd75..0000000000 --- a/var/package/Mage_Core_Modules-1.5.0.0.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - Mage_Core_Modules - 1.5.0.0 - stable - OSL v3.0 - community - - Collection of Magento Core Modules - Collection of Magento Core Modules - 1.5.0.0 - Magento Core Teamcorecore@magentocommerce.com - 2011-02-08 - - - - 5.2.06.0.0Lib_Variencommunity1.5.0.01.6.0.0Lib_Google_Checkoutcommunity1.5.0.01.6.0.0Lib_Js_Calendarcommunity1.51.11.52Lib_Js_Magecommunity1.5.0.01.6.0.0Lib_Js_Prototypecommunity1.6.0.3.41.6.1Lib_Phpseclibcommunity1.5.0.01.6.0.0Mage_Locale_en_UScommunity1.5.0.01.6.0.0Lib_Magecommunity1.5.0.01.6.0.0 -