Skip to content

Commit 13ebca7

Browse files
FlyingmanaFlyingmana
committed
Merge tag '1.9.4.1' of github.com:OpenMage/magento-mirror into 1.9.4.x
 Conflicts: app/code/core/Mage/Compiler/Block/Process.php app/code/core/Mage/Compiler/Helper/Data.php app/code/core/Mage/Compiler/Model/Process.php app/code/core/Mage/Compiler/controllers/Adminhtml/Compiler/ProcessController.php app/code/core/Mage/Compiler/controllers/ProcessController.php app/code/core/Mage/Compiler/etc/adminhtml.xml app/code/core/Mage/Compiler/etc/compilation.xml app/code/core/Mage/Compiler/etc/config.xml app/code/core/Mage/Sales/doc/test.php app/design/adminhtml/default/default/layout/compiler.xml app/design/adminhtml/default/default/template/compiler/process.phtml app/etc/modules/Mage_Compiler.xml shell/compiler.php
2 parents 2763efd + f2fcb8e commit 13ebca7

File tree

9,242 files changed

+10705
-9631
lines changed

Some content is hidden

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

9,242 files changed

+10705
-9631
lines changed

‎RELEASE_NOTES.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
==== 1.9.4.1 ====
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4+
] NOTE: Current Release Notes are maintained at: [
5+
] [
6+
] http://devdocs.magento.com/guides/m1x/ce19-ee114/ce1.9_release-notes.html [
7+
] [
8+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
10+
111
==== 1.9.4.0 ====
212
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
313
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

‎api.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*
2121
* @category Mage
2222
* @package Mage
23-
* @copyright Copyright (c) 2006-2018 Magento, Inc. (http://www.magento.com)
23+
* @copyright Copyright (c) 2006-2019 Magento, Inc. (http://www.magento.com)
2424
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

‎app/Mage.php‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*
2121
* @category Mage
2222
* @package Mage
23-
* @copyright Copyright (c) 2006-2018 Magento, Inc. (http://www.magento.com)
23+
* @copyright Copyright (c) 2006-2019 Magento, Inc. (http://www.magento.com)
2424
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

@@ -172,7 +172,7 @@ public static function getVersionInfo()
172172
'major' => '1',
173173
'minor' => '9',
174174
'revision' => '4',
175-
'patch' => '0',
175+
'patch' => '1',
176176
'stability' => '',
177177
'number' => '',
178178
);
@@ -806,16 +806,22 @@ public static function log($message, $level = null, $file = '', $forceLog = fals
806806
static $loggers = array();
807807

808808
$level = is_null($level) ? Zend_Log::DEBUG : $level;
809-
$file = empty($file) ? 'system.log' : basename($file);
809+
$file = empty($file) ?
810+
(string) self::getConfig()->getNode('dev/log/file', Mage_Core_Model_Store::DEFAULT_CODE) : basename($file);
810811

811812
// Validate file extension before save. Allowed file extensions: log, txt, html, csv
812-
if (!self::helper('log')->isLogFileExtensionValid($file)) {
813+
$_allowedFileExtensions = explode(
814+
',',
815+
(string) self::getConfig()->getNode('dev/log/allowedFileExtensions', Mage_Core_Model_Store::DEFAULT_CODE)
816+
);
817+
$logValidator = new Zend_Validate_File_Extension($_allowedFileExtensions);
818+
$logDir = self::getBaseDir('var') . DS . 'log';
819+
if (!$logValidator->isValid($logDir . DS . $file)) {
813820
return;
814821
}
815822

816823
try {
817824
if (!isset($loggers[$file])) {
818-
$logDir = self::getBaseDir('var') . DS . 'log';
819825
$logFile = $logDir . DS . $file;
820826

821827
if (!is_dir($logDir)) {

‎app/bootstrap.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*
2121
* @category Mage
2222
* @package Mage
23-
* @copyright Copyright (c) 2006-2018 Magento, Inc. (http://www.magento.com)
23+
* @copyright Copyright (c) 2006-2019 Magento, Inc. (http://www.magento.com)
2424
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

‎app/code/community/Phoenix/Moneybookers/Block/Form.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Phoenix
1616
* @package Phoenix_Moneybookers
17-
* @copyright Copyright (c) 2018 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
17+
* @copyright Copyright (c) 2019 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020
class Phoenix_Moneybookers_Block_Form extends Mage_Payment_Block_Form

‎app/code/community/Phoenix/Moneybookers/Block/Info.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Phoenix
1616
* @package Phoenix_Moneybookers
17-
* @copyright Copyright (c) 2018 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
17+
* @copyright Copyright (c) 2019 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020
class Phoenix_Moneybookers_Block_Info extends Mage_Payment_Block_Info

‎app/code/community/Phoenix/Moneybookers/Block/Jsinit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Phoenix
1616
* @package Phoenix_Moneybookers
17-
* @copyright Copyright (c) 2018 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
17+
* @copyright Copyright (c) 2019 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020
class Phoenix_Moneybookers_Block_Jsinit extends Mage_Adminhtml_Block_Template

‎app/code/community/Phoenix/Moneybookers/Block/Payment.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Phoenix
1616
* @package Phoenix_Moneybookers
17-
* @copyright Copyright (c) 2018 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
17+
* @copyright Copyright (c) 2019 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020
class Phoenix_Moneybookers_Block_Payment extends Mage_Core_Block_Template

‎app/code/community/Phoenix/Moneybookers/Block/Placeform.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Phoenix
1616
* @package Phoenix_Moneybookers
17-
* @copyright Copyright (c) 2018 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
17+
* @copyright Copyright (c) 2019 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020
class Phoenix_Moneybookers_Block_Placeform extends Mage_Core_Block_Template

‎app/code/community/Phoenix/Moneybookers/Block/Redirect.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
* @category Phoenix
1616
* @package Phoenix_Moneybookers
17-
* @copyright Copyright (c) 2018 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
17+
* @copyright Copyright (c) 2019 Phoenix Medien GmbH & Co. KG (http://www.phoenix-medien.de)
1818
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1919
*/
2020
class Phoenix_Moneybookers_Block_Redirect extends Mage_Core_Block_Template

0 commit comments

Comments
 (0)