Skip to content

Commit

Permalink
Import Magento Release 1.5.0.0-alpha1
Browse files Browse the repository at this point in the history
  • Loading branch information
@LeeSaferite
LeeSaferite committed Dec 22, 2010
1 parent b7dc90c commit f3e3f62
Show file tree
Hide file tree
Showing 2,073 changed files with 109,189 additions and 77,040 deletions.
3 changes: 1 addition & 2 deletions .htaccess
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
## adjust memory limit

# php_value memory_limit 64M
php_value memory_limit 128M
php_value memory_limit 256M
php_value max_execution_time 18000

############################################
Expand Down Expand Up @@ -176,4 +176,3 @@
## http://developer.yahoo.com/performance/rules.html#etags

#FileETag none

564 changes: 558 additions & 6 deletions RELEASE_NOTES.txt
View file

Large diffs are not rendered by default.

45 changes: 38 additions & 7 deletions app/Mage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,11 @@ public static function getVersionInfo()
{
return array(
'major' => '1',
'minor' => '4',
'revision' => '2',
'minor' => '5',
'revision' => '0',
'patch' => '0',
'stability' => '',
'number' => '',
'stability' => 'alpha',
'number' => '1',
);
}

Expand Down Expand Up @@ -574,6 +574,37 @@ public static function app($code = '', $type = 'store', $options = array())
return self::$_app;
}

/**
* @static
* @param string $code
* @param string $type
* @param array $options
* @param string|array $modules
*/
public static function init($code = '', $type = 'store', $options = array(), $modules = array())
{
try {
self::setRoot();
self::$_app = new Mage_Core_Model_App();
self::$_config = new Mage_Core_Model_Config();

if (!empty($modules)) {
self::$_app->initSpecified($code, $type, $options, $modules);
} else {
self::$_app->init($code, $type, $options);
}
} catch (Mage_Core_Model_Session_Exception $e) {
header('Location: ' . self::getBaseUrl());
die;
} catch (Mage_Core_Model_Store_Exception $e) {
require_once(self::getBaseDir() . DS . 'errors' . DS . '404.php');
die;
} catch (Exception $e) {
self::printException($e);
die;
}
}

/**
* Front end main entry point
*
Expand All @@ -586,9 +617,9 @@ public static function run($code = '', $type = 'store', $options=array())
try {
Varien_Profiler::start('mage');
self::setRoot();
self::$_app = new Mage_Core_Model_App();
self::$_events = new Varien_Event_Collection();
self::$_config = new Mage_Core_Model_Config();
self::$_app = new Mage_Core_Model_App();
self::$_events = new Varien_Event_Collection();
self::$_config = new Mage_Core_Model_Config();
self::$_app->run(array(
'scope_code' => $code,
'scope_type' => $type,
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/Block/Adminhtml/Edit/Codes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/Block/Adminhtml/Edit/Codes/Edit/Form.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/Block/Adminhtml/List/Codes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/Block/Adminhtml/List/Codes/Grid.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/Block/Adminhtml/List/Items.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/Block/Adminhtml/List/Items/Grid.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/Helper/Data.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/Model/Adminhtml/System/Source/Cron/Frequency.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/Model/Adminhtml/System/Source/Cron/Hours.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/Model/Codes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/Model/Import.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/Model/Mysql4/Codes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/Model/Mysql4/Codes/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/Model/Mysql4/Setup.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/Model/Observer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/controllers/Adminhtml/Codes/GridController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/controllers/Adminhtml/Items/GridController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/etc/adminhtml.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/etc/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/etc/system.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/sql/find_feed_setup/mysql4-install-0.0.1.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Find/Feed/sql/find_feed_setup/mysql4-upgrade-0.0.1-0.0.2.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Find
* @package Find_Feed
* @category
* @package _home
* @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Expand Down
1 change: 1 addition & 0 deletions app/code/core/Mage/AdminNotification/Helper/Data.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ public function getPopupObjectUrl($withExt = false)

/**
* Check is readable Popup Notification Object
* @deprecated after 1.4.2.0
*
* @return bool
*/
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ protected function _prepareForm() {
}
}
if ($element = $form->getElement('custom_use_parent_settings')) {
$element->setOnclick('onCustomUseParentChanged(this)');
$element->setData('onchange', 'onCustomUseParentChanged(this)');
}
}

Expand Down
Loading

0 comments on commit f3e3f62

Please sign in to comment.