Skip to content

Commit 9dad9ef

Browse files
LeeSaferiteLeeSaferite
committed
Merge remote-tracking branch 'magento-mirror/magento-1.9' into magento-lts-1.9
Conflicts: downloader/lib/Mage/Connect/Backup.php downloader/lib/Mage/Connect/Packager.php downloader/lib/Mage/HTTP/Client/Curl.php lib/Zend/Xml/Security.php
2 parents 6d38f1a + 053e0b2 commit 9dad9ef

File tree

11,323 files changed

+545445
-225570
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

11,323 files changed

+545445
-225570
lines changed

‎app/Mage.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ public static function getVersionInfo()
170170
return array(
171171
'major' => '1',
172172
'minor' => '9',
173-
'revision' => '0',
174-
'patch' => '1',
173+
'revision' => '1',
174+
'patch' => '0',
175175
'stability' => '',
176176
'number' => '',
177177
);

‎app/code/community/Phoenix/Moneybookers/Model/Event.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ class Phoenix_Moneybookers_Model_Event
2828
const MONEYBOOKERS_STATUS_PENDING = 0;
2929
const MONEYBOOKERS_STATUS_SUCCESS = 2;
3030

31-
/*
32-
* @param Mage_Sales_Model_Order
31+
/**
32+
* Store order instance
33+
*
34+
* @var Mage_Sales_Model_Order
3335
*/
3436
protected $_order = null;
3537

@@ -151,6 +153,8 @@ protected function _processCancel($msg)
151153
/**
152154
* Processes payment confirmation, creates invoice if necessary, updates order status,
153155
* sends order confirmation to customer
156+
*
157+
* @param string $status
154158
* @param string $msg Order history message
155159
*/
156160
protected function _processSale($status, $msg)
@@ -162,7 +166,7 @@ protected function _processSale($status, $msg)
162166
// save transaction ID
163167
$this->_order->getPayment()->setLastTransId($this->getEventData('mb_transaction_id'));
164168
// send new order email
165-
$this->_order->sendNewOrderEmail();
169+
$this->_order->queueNewOrderEmail();
166170
$this->_order->setEmailSent(true);
167171
break;
168172
case self::MONEYBOOKERS_STATUS_PENDING:

‎app/code/core/Mage/Admin/Helper/Data.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
* http://opensource.org/licenses/osl-3.0.php
1111
* If you did not receive a copy of the license and are unable to
1212
* obtain it through the world-wide-web, please send an email
13-
* to license@magentocommerce.com so we can send you a copy immediately.
13+
* to license@magento.com so we can send you a copy immediately.
1414
*
1515
* DISCLAIMER
1616
*
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
19-
* needs please refer to http://www.magentocommerce.com for more information.
19+
* needs please refer to http://www.magento.com for more information.
2020
*
2121
* @category Mage
2222
* @package Mage_Admin
23-
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
23+
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

2727
/**

‎app/code/core/Mage/Admin/Model/Acl.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
* http://opensource.org/licenses/osl-3.0.php
1111
* If you did not receive a copy of the license and are unable to
1212
* obtain it through the world-wide-web, please send an email
13-
* to license@magentocommerce.com so we can send you a copy immediately.
13+
* to license@magento.com so we can send you a copy immediately.
1414
*
1515
* DISCLAIMER
1616
*
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
19-
* needs please refer to http://www.magentocommerce.com for more information.
19+
* needs please refer to http://www.magento.com for more information.
2020
*
2121
* @category Mage
2222
* @package Mage_Admin
23-
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
23+
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

2727

‎app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
* http://opensource.org/licenses/osl-3.0.php
1111
* If you did not receive a copy of the license and are unable to
1212
* obtain it through the world-wide-web, please send an email
13-
* to license@magentocommerce.com so we can send you a copy immediately.
13+
* to license@magento.com so we can send you a copy immediately.
1414
*
1515
* DISCLAIMER
1616
*
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
19-
* needs please refer to http://www.magentocommerce.com for more information.
19+
* needs please refer to http://www.magento.com for more information.
2020
*
2121
* @category Mage
2222
* @package Mage_Admin
23-
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
23+
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

2727

‎app/code/core/Mage/Admin/Model/Acl/Assert/Time.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
* http://opensource.org/licenses/osl-3.0.php
1111
* If you did not receive a copy of the license and are unable to
1212
* obtain it through the world-wide-web, please send an email
13-
* to license@magentocommerce.com so we can send you a copy immediately.
13+
* to license@magento.com so we can send you a copy immediately.
1414
*
1515
* DISCLAIMER
1616
*
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
19-
* needs please refer to http://www.magentocommerce.com for more information.
19+
* needs please refer to http://www.magento.com for more information.
2020
*
2121
* @category Mage
2222
* @package Mage_Admin
23-
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
23+
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

2727

‎app/code/core/Mage/Admin/Model/Acl/Resource.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
* http://opensource.org/licenses/osl-3.0.php
1111
* If you did not receive a copy of the license and are unable to
1212
* obtain it through the world-wide-web, please send an email
13-
* to license@magentocommerce.com so we can send you a copy immediately.
13+
* to license@magento.com so we can send you a copy immediately.
1414
*
1515
* DISCLAIMER
1616
*
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
19-
* needs please refer to http://www.magentocommerce.com for more information.
19+
* needs please refer to http://www.magento.com for more information.
2020
*
2121
* @category Mage
2222
* @package Mage_Admin
23-
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
23+
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

2727

‎app/code/core/Mage/Admin/Model/Acl/Role.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
* http://opensource.org/licenses/osl-3.0.php
1111
* If you did not receive a copy of the license and are unable to
1212
* obtain it through the world-wide-web, please send an email
13-
* to license@magentocommerce.com so we can send you a copy immediately.
13+
* to license@magento.com so we can send you a copy immediately.
1414
*
1515
* DISCLAIMER
1616
*
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
19-
* needs please refer to http://www.magentocommerce.com for more information.
19+
* needs please refer to http://www.magento.com for more information.
2020
*
2121
* @category Mage
2222
* @package Mage_Admin
23-
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
23+
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

2727

‎app/code/core/Mage/Admin/Model/Acl/Role/Generic.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
* http://opensource.org/licenses/osl-3.0.php
1111
* If you did not receive a copy of the license and are unable to
1212
* obtain it through the world-wide-web, please send an email
13-
* to license@magentocommerce.com so we can send you a copy immediately.
13+
* to license@magento.com so we can send you a copy immediately.
1414
*
1515
* DISCLAIMER
1616
*
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
19-
* needs please refer to http://www.magentocommerce.com for more information.
19+
* needs please refer to http://www.magento.com for more information.
2020
*
2121
* @category Mage
2222
* @package Mage_Admin
23-
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
23+
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

2727

‎app/code/core/Mage/Admin/Model/Acl/Role/Group.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
* http://opensource.org/licenses/osl-3.0.php
1111
* If you did not receive a copy of the license and are unable to
1212
* obtain it through the world-wide-web, please send an email
13-
* to license@magentocommerce.com so we can send you a copy immediately.
13+
* to license@magento.com so we can send you a copy immediately.
1414
*
1515
* DISCLAIMER
1616
*
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
19-
* needs please refer to http://www.magentocommerce.com for more information.
19+
* needs please refer to http://www.magento.com for more information.
2020
*
2121
* @category Mage
2222
* @package Mage_Admin
23-
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
23+
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

2727

‎app/code/core/Mage/Admin/Model/Acl/Role/Registry.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
* http://opensource.org/licenses/osl-3.0.php
1111
* If you did not receive a copy of the license and are unable to
1212
* obtain it through the world-wide-web, please send an email
13-
* to license@magentocommerce.com so we can send you a copy immediately.
13+
* to license@magento.com so we can send you a copy immediately.
1414
*
1515
* DISCLAIMER
1616
*
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
19-
* needs please refer to http://www.magentocommerce.com for more information.
19+
* needs please refer to http://www.magento.com for more information.
2020
*
2121
* @category Mage
2222
* @package Mage_Admin
23-
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
23+
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

2727

‎app/code/core/Mage/Admin/Model/Acl/Role/User.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
* http://opensource.org/licenses/osl-3.0.php
1111
* If you did not receive a copy of the license and are unable to
1212
* obtain it through the world-wide-web, please send an email
13-
* to license@magentocommerce.com so we can send you a copy immediately.
13+
* to license@magento.com so we can send you a copy immediately.
1414
*
1515
* DISCLAIMER
1616
*
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
19-
* needs please refer to http://www.magentocommerce.com for more information.
19+
* needs please refer to http://www.magento.com for more information.
2020
*
2121
* @category Mage
2222
* @package Mage_Admin
23-
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
23+
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

2727

‎app/code/core/Mage/Admin/Model/Config.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
* http://opensource.org/licenses/osl-3.0.php
1111
* If you did not receive a copy of the license and are unable to
1212
* obtain it through the world-wide-web, please send an email
13-
* to license@magentocommerce.com so we can send you a copy immediately.
13+
* to license@magento.com so we can send you a copy immediately.
1414
*
1515
* DISCLAIMER
1616
*
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
19-
* needs please refer to http://www.magentocommerce.com for more information.
19+
* needs please refer to http://www.magento.com for more information.
2020
*
2121
* @category Mage
2222
* @package Mage_Admin
23-
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
23+
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

2727

‎app/code/core/Mage/Admin/Model/Mysql4/Acl.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
* http://opensource.org/licenses/osl-3.0.php
1111
* If you did not receive a copy of the license and are unable to
1212
* obtain it through the world-wide-web, please send an email
13-
* to license@magentocommerce.com so we can send you a copy immediately.
13+
* to license@magento.com so we can send you a copy immediately.
1414
*
1515
* DISCLAIMER
1616
*
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
19-
* needs please refer to http://www.magentocommerce.com for more information.
19+
* needs please refer to http://www.magento.com for more information.
2020
*
2121
* @category Mage
2222
* @package Mage_Admin
23-
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
23+
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

2727

‎app/code/core/Mage/Admin/Model/Mysql4/Acl/Role.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
* http://opensource.org/licenses/osl-3.0.php
1111
* If you did not receive a copy of the license and are unable to
1212
* obtain it through the world-wide-web, please send an email
13-
* to license@magentocommerce.com so we can send you a copy immediately.
13+
* to license@magento.com so we can send you a copy immediately.
1414
*
1515
* DISCLAIMER
1616
*
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
19-
* needs please refer to http://www.magentocommerce.com for more information.
19+
* needs please refer to http://www.magento.com for more information.
2020
*
2121
* @category Mage
2222
* @package Mage_Admin
23-
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
23+
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

2727

‎app/code/core/Mage/Admin/Model/Mysql4/Acl/Role/Collection.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
* http://opensource.org/licenses/osl-3.0.php
1111
* If you did not receive a copy of the license and are unable to
1212
* obtain it through the world-wide-web, please send an email
13-
* to license@magentocommerce.com so we can send you a copy immediately.
13+
* to license@magento.com so we can send you a copy immediately.
1414
*
1515
* DISCLAIMER
1616
*
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
19-
* needs please refer to http://www.magentocommerce.com for more information.
19+
* needs please refer to http://www.magento.com for more information.
2020
*
2121
* @category Mage
2222
* @package Mage_Admin
23-
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
23+
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

2727

‎app/code/core/Mage/Admin/Model/Mysql4/Permissions/Collection.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
* http://opensource.org/licenses/osl-3.0.php
1111
* If you did not receive a copy of the license and are unable to
1212
* obtain it through the world-wide-web, please send an email
13-
* to license@magentocommerce.com so we can send you a copy immediately.
13+
* to license@magento.com so we can send you a copy immediately.
1414
*
1515
* DISCLAIMER
1616
*
1717
* Do not edit or add to this file if you wish to upgrade Magento to newer
1818
* versions in the future. If you wish to customize Magento for your
19-
* needs please refer to http://www.magentocommerce.com for more information.
19+
* needs please refer to http://www.magento.com for more information.
2020
*
2121
* @category Mage
2222
* @package Mage_Admin
23-
* @copyright Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
24-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
23+
* @copyright Copyright (c) 2006-2014 X.commerce, Inc. (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

2727

0 commit comments

Comments
 (0)