Skip to content

Commit

Permalink
Import Magento Release 1.9.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@drobinson
drobinson committed May 4, 2015
1 parent 68ce5a3 commit e2b8244
Show file tree
Hide file tree
Showing 7,485 changed files with 10,955 additions and 10,538 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
10 changes: 5 additions & 5 deletions api.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@magentocommerce.com so we can send you a copy immediately.
* to license@magento.com 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.
* needs please refer to http://www.magento.com for more information.
*
* @category Mage
* @package Mage_Api2
* @copyright Copyright (c) 2011 Magento Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* @package Mage
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

if (version_compare(phpversion(), '5.2.0', '<')) {
Expand Down
12 changes: 6 additions & 6 deletions app/Mage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@magentocommerce.com so we can send you a copy immediately.
* to license@magento.com 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.
* needs please refer to http://www.magento.com for more information.
*
* @category Mage
* @package Mage_Core
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
* @category Mage
* @package Mage
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down Expand Up @@ -171,7 +171,7 @@ public static function getVersionInfo()
'major' => '1',
'minor' => '9',
'revision' => '1',
'patch' => '0',
'patch' => '1',
'stability' => '',
'number' => '',
);
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Helper/Data.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Acl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Acl/Assert/Time.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Acl/Resource.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Acl/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Acl/Role/Generic.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Acl/Role/Group.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Acl/Role/Registry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Acl/Role/User.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Acl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Role/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Roles.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Roles/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Rules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/Rules/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 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 @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Mysql4/User/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Observer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Redirectpolicy.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Resource/Acl.php
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Resource/Acl/Role.php
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Resource/Acl/Role/Collection.php
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Resource/Permissions/Collection.php
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Resource/Role.php
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Resource/Role/Collection.php
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Resource/Roles.php
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Resource/Rules.php
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Resource/Rules/Collection.php
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Admin/Model/Resource/User.php
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* @category Mage
* @package Mage_Admin
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
* @copyright Copyright (c) 2006-2015 X.commerce, Inc. (http://www.magento.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Loading

0 comments on commit e2b8244

Please sign in to comment.