Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit ecd87b9

Browse files
drobinsondrobinson
authored
Merge pull request #50 from borriglione/magento-1.9
Import Magento Release 1.9.3.4
2 parents 7185e6f + 2725b76 commit ecd87b9

File tree

54 files changed

+331
-198
lines changed

Some content is hidden

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

54 files changed

+331
-198
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.3.4 ====
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.3.3 ====
212
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
313
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

‎app/Mage.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public static function getVersionInfo()
171171
'major' => '1',
172172
'minor' => '9',
173173
'revision' => '3',
174-
'patch' => '3',
174+
'patch' => '4',
175175
'stability' => '',
176176
'number' => '',
177177
);

‎app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Symlink.php‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?php
2+
/**
3+
* Magento
4+
*
5+
* NOTICE OF LICENSE
6+
*
7+
* This source file is subject to the Open Software License (OSL 3.0)
8+
* that is bundled with this package in the file LICENSE.txt.
9+
* It is also available through the world-wide-web at this URL:
10+
* http://opensource.org/licenses/osl-3.0.php
11+
* If you did not receive a copy of the license and are unable to
12+
* obtain it through the world-wide-web, please send an email
13+
* to [email protected] so we can send you a copy immediately.
14+
*
15+
* DISCLAIMER
16+
*
17+
* Do not edit or add to this file if you wish to upgrade Magento to newer
18+
* versions in the future. If you wish to customize Magento for your
19+
* needs please refer to http://www.magento.com for more information.
20+
*
21+
* @category Mage
22+
* @package Mage_Adminhtml
23+
* @copyright Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25+
*/
26+
27+
/**
28+
* System config symlink backend model
29+
*
30+
* @category Mage
31+
* @package Mage_Adminhtml
32+
*/
33+
class Mage_Adminhtml_Model_System_Config_Backend_Symlink extends Mage_Core_Model_Config_Data
34+
{
35+
/**
36+
* Save object data
37+
*
38+
* @return Mage_Core_Model_Abstract
39+
*/
40+
public function save()
41+
{
42+
return $this;
43+
}
44+
}

‎app/code/core/Mage/Checkout/controllers/OnepageController.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,6 @@ public function saveMethodAction()
350350
return;
351351
}
352352

353-
if ($this->isFormkeyValidationOnCheckoutEnabled() && !$this->_validateFormKey()) {
354-
return;
355-
}
356-
357353
if ($this->getRequest()->isPost()) {
358354
$method = $this->getRequest()->getPost('method');
359355
$result = $this->getOnepage()->saveCheckoutMethod($method);

‎app/code/core/Mage/Core/Model/File/Validator/Image.php‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,26 @@ public function validate($filePath)
9595
$image = imagecreatefromstring(file_get_contents($filePath));
9696
if ($image !== false) {
9797
$img = imagecreatetruecolor($imageWidth, $imageHeight);
98+
imagealphablending($img, false);
9899
imagecopyresampled($img, $image, 0, 0, 0, 0, $imageWidth, $imageHeight, $imageWidth, $imageHeight);
100+
imagesavealpha($img, true);
101+
99102
switch ($fileType) {
100103
case IMAGETYPE_GIF:
104+
$transparencyIndex = imagecolortransparent($image);
105+
if ($transparencyIndex >= 0) {
106+
imagecolortransparent($img, $transparencyIndex);
107+
for ($y = 0; $y < $imageHeight; ++$y) {
108+
for ($x = 0; $x < $imageWidth; ++$x) {
109+
if (((imagecolorat($img, $x, $y) >> 24) & 0x7F)) {
110+
imagesetpixel($img, $x, $y, $transparencyIndex);
111+
}
112+
}
113+
}
114+
}
115+
if (!imageistruecolor($image)) {
116+
imagetruecolortopalette($img, false, imagecolorstotal($image));
117+
}
101118
imagegif($img, $filePath);
102119
break;
103120
case IMAGETYPE_JPEG:
@@ -107,8 +124,9 @@ public function validate($filePath)
107124
imagepng($img, $filePath);
108125
break;
109126
default:
110-
return;
127+
break;
111128
}
129+
112130
imagedestroy($img);
113131
imagedestroy($image);
114132
return null;

‎app/code/core/Mage/Core/etc/config.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<config>
2929
<modules>
3030
<Mage_Core>
31-
<version>1.6.0.6</version>
31+
<version>1.6.0.7</version>
3232
</Mage_Core>
3333
</modules>
3434
<global>

‎app/code/core/Mage/Core/etc/system.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -597,6 +597,27 @@
597597
</template_hints_blocks>
598598
</fields>
599599
</debug>
600+
<template translate="label">
601+
<label>Template Settings</label>
602+
<frontend_type>text</frontend_type>
603+
<sort_order>25</sort_order>
604+
<show_in_default>0</show_in_default>
605+
<show_in_website>0</show_in_website>
606+
<show_in_store>0</show_in_store>
607+
<fields>
608+
<allow_symlink translate="label comment">
609+
<label>Allow Symlinks</label>
610+
<frontend_type>select</frontend_type>
611+
<source_model>adminhtml/system_config_source_yesno</source_model>
612+
<backend_model>adminhtml/system_config_backend_symlink</backend_model>
613+
<sort_order>10</sort_order>
614+
<show_in_default>0</show_in_default>
615+
<show_in_website>0</show_in_website>
616+
<show_in_store>0</show_in_store>
617+
<comment>Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.</comment>
618+
</allow_symlink>
619+
</fields>
620+
</template>
600621
<translate_inline translate="label">
601622
<label>Translate Inline</label>
602623
<frontend_type>text</frontend_type>

‎app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.6-1.6.0.7.php‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
/**
3+
* Magento
4+
*
5+
* NOTICE OF LICENSE
6+
*
7+
* This source file is subject to the Open Software License (OSL 3.0)
8+
* that is bundled with this package in the file LICENSE.txt.
9+
* It is also available through the world-wide-web at this URL:
10+
* http://opensource.org/licenses/osl-3.0.php
11+
* If you did not receive a copy of the license and are unable to
12+
* obtain it through the world-wide-web, please send an email
13+
* to [email protected] so we can send you a copy immediately.
14+
*
15+
* DISCLAIMER
16+
*
17+
* Do not edit or add to this file if you wish to upgrade Magento to newer
18+
* versions in the future. If you wish to customize Magento for your
19+
* needs please refer to http://www.magento.com for more information.
20+
*
21+
* @category Mage
22+
* @package Mage_Core
23+
* @copyright Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com)
24+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25+
*/
26+
27+
/* @var $installer Mage_Core_Model_Resource_Setup */
28+
$installer = $this;
29+
30+
$installer->startSetup();
31+
$connection = $installer->getConnection();
32+
33+
$connection->delete(
34+
$this->getTable('core_config_data'),
35+
$connection->prepareSqlCondition('path', array(
36+
'like' => 'dev/template/allow_symlink'
37+
))
38+
);
39+
40+
$installer->endSetup();

‎app/design/adminhtml/default/default/layout/main.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,9 @@ Default layout, loads most of the pages
119119
<block type="adminhtml/cache_notifications" name="cache_notifications" template="system/cache/notifications.phtml"></block>
120120
<block type="adminhtml/notification_survey" name="notification_survey" template="notification/survey.phtml"/>
121121
<block type="adminhtml/notification_security" name="notification_security" as="notification_security" template="notification/security.phtml"></block>
122-
<block type="adminhtml/checkout_formkey" name="checkout_formkey" as="checkout_formkey" template="notification/formkey.phtml"/></block>
122+
<block type="adminhtml/checkout_formkey" name="checkout_formkey" as="checkout_formkey" template="notification/formkey.phtml"/>
123123
<block type="adminhtml/notification_symlink" name="notification_symlink" template="notification/symlink.phtml"/>
124+
</block>
124125
<block type="adminhtml/widget_breadcrumbs" name="breadcrumbs" as="breadcrumbs"></block>
125126

126127
<!--<update handle="formkey"/> this won't work, see the try/catch and a jammed exception in Mage_Core_Model_Layout::createBlock() -->

‎app/design/adminhtml/default/default/template/oauth/authorize/head-simple.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
var BLANK_URL = '<?php echo $this->getJsUrl() ?>blank.html';
4343
var BLANK_IMG = '<?php echo $this->getJsUrl() ?>spacer.gif';
4444
var BASE_URL = '<?php echo $this->getUrl('*') ?>';
45-
var SKIN_URL = '<?php echo $this->getSkinUrl() ?>';
45+
var SKIN_URL = '<?php echo $this->jsQuoteEscape($this->getSkinUrl()) ?>';
4646
var FORM_KEY = '<?php echo $this->getFormKey() ?>';
4747
//]]>
4848
</script>

0 commit comments

Comments
 (0)