Skip to content

Commit d2dcce8

Browse files
FlyingmanaFlyingmana
authored
Merge pull request #791 from OpenMage/upstream-merge-1.9.4.2
Upstream merge 1.9.4.2
2 parents f306599 + af1ec83 commit d2dcce8

File tree

135 files changed

+942
-295
lines changed

Some content is hidden

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

135 files changed

+942
-295
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.2 ====
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.1 ====
212
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
313
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

‎app/Mage.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public static function getVersionInfo()
172172
'major' => '1',
173173
'minor' => '9',
174174
'revision' => '4',
175-
'patch' => '1',
175+
'patch' => '2',
176176
'stability' => '',
177177
'number' => '',
178178
);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function validate()
5757
if (in_array($this->getBlockName(), $disallowedBlockNames)) {
5858
$errors[] = Mage::helper('adminhtml')->__('Block Name is disallowed.');
5959
}
60-
if (!Zend_Validate::is($this->getBlockName(), 'Regex', array('/^[-_a-zA-Z0-9\/]*$/'))) {
60+
if (!Zend_Validate::is($this->getBlockName(), 'Regex', array('/^[-_a-zA-Z0-9]+\/[-_a-zA-Z0-9\/]+$/'))) {
6161
$errors[] = Mage::helper('adminhtml')->__('Block Name is incorrect.');
6262
}
6363

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ public function validate()
590590
}
591591

592592
if ($this->userExists()) {
593-
$errors[] = Mage::helper('adminhtml')->__('A user with the same user name or email aleady exists.');
593+
$errors[] = Mage::helper('adminhtml')->__('A user with the same user name or email already exists.');
594594
}
595595

596596
if (count($errors) === 0) {

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,15 @@
6464
<show_in_website>0</show_in_website>
6565
<show_in_store>0</show_in_store>
6666
</last_update>
67+
<feed_url>
68+
<label>Feed Url</label>
69+
<frontend_type>text</frontend_type>
70+
<backend_model>adminhtml/system_config_backend_protected</backend_model>
71+
<sort_order>3</sort_order>
72+
<show_in_default>0</show_in_default>
73+
<show_in_website>0</show_in_website>
74+
<show_in_store>0</show_in_store>
75+
</feed_url>
6776
</fields>
6877
</adminnotification>
6978
</groups>

‎app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public function getGridUrl()
157157
protected function _getUsers($json=false)
158158
{
159159
if ( $this->getRequest()->getParam('in_role_user') != "" ) {
160-
return $this->getRequest()->getParam('in_role_user');
160+
return (int)$this->getRequest()->getParam('in_role_user');
161161
}
162162
$roleId = ( $this->getRequest()->getParam('rid') > 0 ) ? $this->getRequest()->getParam('rid') : Mage::registry('RID');
163163
$users = Mage::getModel('api/roles')->setId($roleId)->getRoleUsers();

‎app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ public function getAttributesJson()
155155
// Hide price if needed
156156
foreach ($attributes as &$attribute) {
157157
$attribute['label'] = $this->escapeHtml($attribute['label']);
158+
$attribute['frontend_label'] = $this->escapeHtml($attribute['frontend_label']);
159+
$attribute['store_label'] = $this->escapeHtml($attribute['store_label']);
158160
if (isset($attribute['values']) && is_array($attribute['values'])) {
159161
foreach ($attribute['values'] as &$attributeValue) {
160162
if (!$this->getCanReadPrice()) {

‎app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Preview.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ protected function _toHtml()
5050
$template->setTemplateText($this->getRequest()->getParam('text'));
5151
$template->setTemplateStyles($this->getRequest()->getParam('styles'));
5252
}
53+
$template->setTemplateStyles(
54+
$this->maliciousCodeFilter($template->getTemplateStyles())
55+
);
56+
$template->setTemplateText(
57+
$this->maliciousCodeFilter($template->getTemplateText())
58+
);
5359

5460
$storeId = (int)$this->getRequest()->getParam('store_id');
5561
if(!$storeId) {

‎app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Preview.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ protected function _toHtml()
4646
$template->setTemplateText($this->getRequest()->getParam('text'));
4747
$template->setTemplateStyles($this->getRequest()->getParam('styles'));
4848
}
49+
$template->setTemplateStyles(
50+
$this->maliciousCodeFilter($template->getTemplateStyles())
51+
);
52+
$template->setTemplateText(
53+
$this->maliciousCodeFilter($template->getTemplateText())
54+
);
4955

5056
$storeId = (int)$this->getRequest()->getParam('store_id');
5157
if(!$storeId) {

‎app/code/core/Mage/Adminhtml/Block/Permissions/Role/Grid/User.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public function getGridUrl()
157157
protected function _getUsers($json=false)
158158
{
159159
if ( $this->getRequest()->getParam('in_role_user') != "" ) {
160-
return $this->getRequest()->getParam('in_role_user');
160+
return (int)$this->getRequest()->getParam('in_role_user');
161161
}
162162
$roleId = ( $this->getRequest()->getParam('rid') > 0 ) ? $this->getRequest()->getParam('rid') : Mage::registry('RID');
163163
$users = Mage::getModel('admin/roles')->setId($roleId)->getRoleUsers();

0 commit comments

Comments
 (0)