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

Commit fe6a94e

Browse files
drobinsondrobinson
authored
Merge pull request #70 from treestonemedia/magento-1.9.4
Update to Magento 1.9.4
2 parents 1ed39d1 + 9ffa3a0 commit fe6a94e

File tree

147 files changed

+30305
-7187
lines changed

Some content is hidden

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

147 files changed

+30305
-7187
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.0 ====
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.10 ====
212
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
313
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

‎app/Mage.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@
5353

5454
Varien_Autoload::register();
5555

56+
include_once "phpseclib/bootstrap.php";
57+
include_once "mcryptcompat/mcrypt.php";
58+
5659
/**
5760
* Main Mage hub class
5861
*
@@ -170,8 +173,8 @@ public static function getVersionInfo()
170173
return array(
171174
'major' => '1',
172175
'minor' => '9',
173-
'revision' => '3',
174-
'patch' => '10',
176+
'revision' => '4',
177+
'patch' => '0',
175178
'stability' => '',
176179
'number' => '',
177180
);

‎app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
* @package Mage_Adminhtml
3333
* @author Magento Core Team <core@magentocommerce.com>
3434
*/
35-
class Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit_Tab_Main extends Mage_Eav_Block_Adminhtml_Attribute_Edit_Main_Abstract
35+
class Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit_Tab_Main
36+
extends Mage_Eav_Block_Adminhtml_Attribute_Edit_Main_Abstract
3637
{
3738
/**
3839
* Adding product form elements for editing attribute
@@ -48,6 +49,17 @@ protected function _prepareForm()
4849
/* @var $fieldset Varien_Data_Form_Element_Fieldset */
4950
$fieldset = $form->getElement('base_fieldset');
5051

52+
$fieldset->getElements()
53+
->searchById('attribute_code')
54+
->setData(
55+
'class',
56+
'validate-code-event ' . $fieldset->getElements()->searchById('attribute_code')->getData('class')
57+
)->setData(
58+
'note',
59+
$fieldset->getElements()->searchById('attribute_code')->getData('note')
60+
. Mage::helper('eav')->__('. Do not use "event" for an attribute code, it is a reserved keyword.')
61+
);
62+
5163
$frontendInputElm = $form->getElement('frontend_input');
5264
$additionalTypes = array(
5365
array(
@@ -94,7 +106,10 @@ protected function _prepareForm()
94106
Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_GLOBAL =>Mage::helper('catalog')->__('Global'),
95107
);
96108

97-
if ($attributeObject->getAttributeCode() == 'status' || $attributeObject->getAttributeCode() == 'tax_class_id') {
109+
if (
110+
$attributeObject->getAttributeCode() == 'status'
111+
|| $attributeObject->getAttributeCode() == 'tax_class_id'
112+
) {
98113
unset($scopes[Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE]);
99114
}
100115

‎app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,18 @@ public function __construct()
4949
}
5050
}
5151

52+
public function getDeleteUrl()
53+
{
54+
if (!Mage::getSingleton('adminhtml/url')->useSecretKey()) {
55+
return $this->getUrl('*/*/delete', array(
56+
$this->_objectId => $this->getRequest()->getParam($this->_objectId),
57+
'form_key' => Mage::getSingleton('core/session')->getFormKey()
58+
));
59+
} else {
60+
parent::getDeleteUrl();
61+
}
62+
}
63+
5264
public function getHeaderText()
5365
{
5466
if(!is_null(Mage::registry('current_group')->getId())) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ public function getForm()
275275
*/
276276
public function getJsTemplateName()
277277
{
278-
return addcslashes($this->getModel()->getTemplateCode(), "\"\r\n\\");
278+
return addcslashes($this->escapeHtml($this->getModel()->getTemplateCode()), "\"\r\n\\");
279279
}
280280

281281
/**

‎app/code/core/Mage/Adminhtml/controllers/Catalog/Product/AttributeController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,10 @@ public function saveAction()
208208

209209
//validate attribute_code
210210
if (isset($data['attribute_code'])) {
211-
$validatorAttrCode = new Zend_Validate_Regex(array('pattern' => '/^[a-z][a-z_0-9]{1,254}$/'));
211+
$validatorAttrCode = new Zend_Validate_Regex(array('pattern' => '/[a-z][a-z_0-9]{1,254}[^event]/'));
212212
if (!$validatorAttrCode->isValid($data['attribute_code'])) {
213213
$session->addError(
214-
Mage::helper('catalog')->__('Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.')
214+
Mage::helper('catalog')->__('Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter. Do not use "event" for an attribute code.')
215215
);
216216
$this->_redirect('*/*/edit', array('attribute_id' => $id, '_current' => true));
217217
return;

‎app/code/core/Mage/Adminhtml/controllers/Cms/BlockController.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,17 @@
3434
*/
3535
class Mage_Adminhtml_Cms_BlockController extends Mage_Adminhtml_Controller_Action
3636
{
37+
/**
38+
* Controller predispatch method
39+
*
40+
* @return Mage_Adminhtml_Controller_Action
41+
*/
42+
public function preDispatch()
43+
{
44+
$this->_setForcedFormKeyActions('delete');
45+
return parent::preDispatch();
46+
}
47+
3748
/**
3849
* Init actions
3950
*

‎app/code/core/Mage/Adminhtml/controllers/Customer/GroupController.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,17 @@
3333
*/
3434
class Mage_Adminhtml_Customer_GroupController extends Mage_Adminhtml_Controller_Action
3535
{
36+
/**
37+
* Controller predispatch method
38+
*
39+
* @return Mage_Adminhtml_Controller_Action
40+
*/
41+
public function preDispatch()
42+
{
43+
$this->_setForcedFormKeyActions('delete');
44+
return parent::preDispatch();
45+
}
46+
3647
protected function _initGroup()
3748
{
3849
$this->_title($this->__('Customers'))->_title($this->__('Customer Groups'));

‎app/code/core/Mage/Adminhtml/controllers/SitemapController.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,17 @@
3333
*/
3434
class Mage_Adminhtml_SitemapController extends Mage_Adminhtml_Controller_Action
3535
{
36+
/**
37+
* Controller predispatch method
38+
*
39+
* @return Mage_Adminhtml_Controller_Action
40+
*/
41+
public function preDispatch()
42+
{
43+
$this->_setForcedFormKeyActions('delete');
44+
return parent::preDispatch();
45+
}
46+
3647
/**
3748
* Init actions
3849
*

‎app/code/core/Mage/Adminhtml/controllers/System/BackupController.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,9 @@ public function massDeleteAction()
369369
*/
370370
protected function _isAllowed()
371371
{
372-
return Mage::getSingleton('admin/session')->isAllowed('system/tools/backup' );
372+
return Mage::getSingleton('admin/session')->isAllowed('system/tools/backup')
373+
&& Mage::helper('core')->isModuleEnabled('Mage_Backup')
374+
&& !Mage::getStoreConfigFlag('advanced/modules_disable_output/Mage_Backup');
373375
}
374376

375377
/**

0 commit comments

Comments
 (0)