Skip to content

Commit

Permalink
Import Magento Release 1.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Magento Mirror committed Jan 17, 2009
1 parent 5b1e92d commit 3fed190
Show file tree
Hide file tree
Showing 3,843 changed files with 38,877 additions and 7,411 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 6 additions & 0 deletions 404/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Core
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
289 changes: 8 additions & 281 deletions STATUS.txt
View file

Large diffs are not rendered by default.

33 changes: 30 additions & 3 deletions app/Mage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Core
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down Expand Up @@ -72,20 +78,41 @@ final class Mage {

static private $_isDeveloperMode = false;

public static $headersSentThrowsException = true;

public static function getVersion()
{
return '1.1.4';
return '1.1.5';
}

/**
* Set all my static data to defaults
*
*/
public static function reset()
{
self::$_registry = array();
self::$_app = null;
self::$_useCache = array();
self::$_objects = null;
self::$_isDownloader = false;
self::$_isDeveloperMode = false;
// do not reset $headersSentThrowsException
}

/**
* Register a new variable
*
* @param string $key
* @param mixed $value
* @param bool $graceful
*/
public static function register($key, $value)
public static function register($key, $value, $graceful = false)
{
if(isset(self::$_registry[$key])){
if(isset(self::$_registry[$key])) {
if ($graceful) {
return;
}
Mage::throwException('Mage registry key "'.$key.'" already exists');
}
self::$_registry[$key] = $value;
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Acl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Acl/Assert/Time.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Acl/Resource.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Acl/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Acl/Role/Generic.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Acl/Role/Group.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Acl/Role/Registry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Acl/Role/User.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Mysql4/Acl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Permissions
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Mysql4/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Permissions
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Permissions
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Mysql4/Roles.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Permissions
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Permissions
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Mysql4/Roles/User/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Permissions
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Mysql4/Rules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Permissions
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Permissions
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
9 changes: 8 additions & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/User.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down Expand Up @@ -205,7 +211,8 @@ public function add(Mage_Core_Model_Abstract $user) {
if ($user->getId() > 0) {
$role = Mage::getModel('admin/role')->load($user->getRoleId());
} else {
$role = array('tree_level' => 0);
$role = new Varien_Object();
$role->setTreeLevel(0);
}
$dbh->insert($this->getTable('admin/role'), array(
'parent_id' => $user->getRoleId(),
Expand Down
6 changes: 6 additions & 0 deletions app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade Magento to newer
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
* @package Mage_Permissions
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
Expand Down
Loading

0 comments on commit 3fed190

Please sign in to comment.