Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -r magento1933/app/code/core/Mage/Admin/Model/Session.php magento1932/app/code/core/Mage/Admin/Model/Session.php
- 141,143d140
- < $e->setMessage(
- < Mage::helper('adminhtml')->__('You did not sign in correctly or your account is temporarily disabled.')
- < );
- Only in magento1933/app/code/core/Mage/Adminhtml/Block/Checkout: Formkey.php
- Only in magento1933/app/code/core/Mage/Adminhtml/Block/Notification: Symlink.php
- diff -r magento1933/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php magento1932/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php
- 149c149
- < $value['from'] = $this->_convertDate($this->stripTags($value['from']), $value['locale']);
- ---
- > $value['from'] = $this->_convertDate($value['from'], $value['locale']);
- 153c153
- < $value['to'] = $this->_convertDate($this->stripTags($value['to']), $value['locale']);
- ---
- > $value['to'] = $this->_convertDate($value['to'], $value['locale']);
- diff -r magento1933/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php magento1932/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php
- 45,49d44
- < $uploader->addValidateCallback(
- < Mage_Core_Model_File_Validator_Image::NAME,
- < Mage::getModel('core/file_validator_image'),
- < 'validate'
- < );
- diff -r magento1933/app/code/core/Mage/Adminhtml/Model/Config/Data.php magento1932/app/code/core/Mage/Adminhtml/Model/Config/Data.php
- 170,172d169
- < if (!Mage::getSingleton('admin/session')->isAllowed($configPath)) {
- < Mage::throwException('Access denied.');
- < }
- diff -r magento1933/app/code/core/Mage/Checkout/controllers/MultishippingController.php magento1932/app/code/core/Mage/Checkout/controllers/MultishippingController.php
- 236,241d235
- <
- < if ($this->isFormkeyValidationOnCheckoutEnabled() && !$this->_validateFormKey()) {
- < $this->_redirect('*/*/addresses');
- < return;
- < }
- <
- 362,366d355
- < if ($this->isFormkeyValidationOnCheckoutEnabled() && !$this->_validateFormKey()) {
- < $this->_redirect('*/*/shipping');
- < return;
- < }
- <
- 474,478d462
- < }
- <
- < if ($this->isFormkeyValidationOnCheckoutEnabled() && !$this->_validateFormKey()) {
- < $this->_redirect('*/*/billing');
- < return;
- diff -r magento1933/app/code/core/Mage/Checkout/controllers/OnepageController.php magento1932/app/code/core/Mage/Checkout/controllers/OnepageController.php
- 352,356d351
- <
- < if ($this->isFormkeyValidationOnCheckoutEnabled() && !$this->_validateFormKey()) {
- < return;
- < }
- <
- 372,376d366
- <
- < if ($this->isFormkeyValidationOnCheckoutEnabled() && !$this->_validateFormKey()) {
- < return;
- < }
- <
- 419,423d408
- <
- < if ($this->isFormkeyValidationOnCheckoutEnabled() && !$this->_validateFormKey()) {
- < return;
- < }
- <
- 448,452d432
- <
- < if ($this->isFormkeyValidationOnCheckoutEnabled() && !$this->_validateFormKey()) {
- < return;
- < }
- <
- 487,491d466
- <
- < if ($this->isFormkeyValidationOnCheckoutEnabled() && !$this->_validateFormKey()) {
- < return;
- < }
- <
- diff -r magento1933/app/code/core/Mage/Checkout/etc/system.xml magento1932/app/code/core/Mage/Checkout/etc/system.xml
- 235,252d234
- < <admin>
- < <groups>
- < <security>
- < <fields>
- < <validate_formkey_checkout translate="label">
- < <label>Enable Form Key Validation On Checkout</label>
- < <frontend_type>select</frontend_type>
- < <source_model>adminhtml/system_config_source_yesno</source_model>
- < <sort_order>4</sort_order>
- < <comment><![CDATA[<strong style="color:red">Important!</strong> Enabling this option means
- < that your custom templates used in checkout process contain form_key output.
- < Otherwise checkout may not work.]]></comment>
- < <show_in_default>1</show_in_default>
- < </validate_formkey_checkout>
- < </fields>
- < </security>
- < </groups>
- < </admin>
- diff -r magento1933/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php magento1932/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php
- 286,290d285
- < $uploader->addValidateCallback(
- < Mage_Core_Model_File_Validator_Image::NAME,
- < Mage::getModel('core/file_validator_image'),
- < 'validate'
- < );
- diff -r magento1933/app/code/core/Mage/Core/Controller/Front/Action.php magento1932/app/code/core/Mage/Core/Controller/Front/Action.php
- 191,200d190
- <
- < /**
- < * Check if form_key validation enabled on checkout process
- < *
- < * @return bool
- < */
- < protected function isFormkeyValidationOnCheckoutEnabled()
- < {
- < return Mage::getStoreConfigFlag('admin/security/validate_formkey_checkout');
- < }
- diff -r magento1933/app/code/core/Mage/Core/Controller/Request/Http.php magento1932/app/code/core/Mage/Core/Controller/Request/Http.php
- 151,154c151
- < if ($baseUrl && $pathInfo && (0 !== stripos($pathInfo, '/'))) {
- < $pathInfo = '';
- < $this->setActionName('noRoute');
- < } elseif ((null !== $baseUrl) && (false === $pathInfo)) {
- ---
- > if ((null !== $baseUrl) && (false === $pathInfo)) {
- diff -r magento1933/app/code/core/Mage/Core/etc/system.xml magento1932/app/code/core/Mage/Core/etc/system.xml
- 599a600,619
- > <template translate="label">
- > <label>Template Settings</label>
- > <frontend_type>text</frontend_type>
- > <sort_order>25</sort_order>
- > <show_in_default>1</show_in_default>
- > <show_in_website>1</show_in_website>
- > <show_in_store>1</show_in_store>
- > <fields>
- > <allow_symlink translate="label comment">
- > <label>Allow Symlinks</label>
- > <frontend_type>select</frontend_type>
- > <source_model>adminhtml/system_config_source_yesno</source_model>
- > <sort_order>10</sort_order>
- > <show_in_default>1</show_in_default>
- > <show_in_website>1</show_in_website>
- > <show_in_store>1</show_in_store>
- > <comment>Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.</comment>
- > </allow_symlink>
- > </fields>
- > </template>
- diff -r magento1933/app/code/core/Mage/Core/Model/File/Validator/Image.php magento1932/app/code/core/Mage/Core/Model/File/Validator/Image.php
- 91,117c91,94
- < list($imageWidth, $imageHeight, $fileType) = getimagesize($filePath);
- < if ($fileType) {
- < if ($this->isImageType($fileType)) {
- < //replace tmp image with re-sampled copy to exclude images with malicious data
- < $image = imagecreatefromstring(file_get_contents($filePath));
- < if ($image !== false) {
- < $img = imagecreatetruecolor($imageWidth, $imageHeight);
- < imagecopyresampled($img, $image, 0, 0, 0, 0, $imageWidth, $imageHeight, $imageWidth, $imageHeight);
- < switch ($fileType) {
- < case IMAGETYPE_GIF:
- < imagegif($img, $filePath);
- < break;
- < case IMAGETYPE_JPEG:
- < imagejpeg($img, $filePath, 100);
- < break;
- < case IMAGETYPE_PNG:
- < imagepng($img, $filePath);
- < break;
- < default:
- < return;
- < }
- < imagedestroy($img);
- < imagedestroy($image);
- < return null;
- < } else {
- < throw Mage::exception('Mage_Core', Mage::helper('core')->__('Invalid image.'));
- < }
- ---
- > $fileInfo = getimagesize($filePath);
- > if (is_array($fileInfo) and isset($fileInfo[2])) {
- > if ($this->isImageType($fileInfo[2])) {
- > return null;
- 131a109
- >
- diff -r magento1933/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php magento1932/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Zend/Cache.php
- 43,45d42
- < if ($this->_resource->getBackend() instanceof Zend_Cache_Backend_Static) {
- < throw new Exception(Mage::helper('dataflow')->__('Backend name "Static" not supported.'));
- < }
- diff -r magento1933/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php magento1932/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php
- 50,61d49
- < /**
- < * Detect serialization of data
- < *
- < * @param mixed $data
- < * @return bool
- < */
- < protected function isSerialized($data)
- < {
- < $pattern = '/^a:\d+:\{(i:\d+;|s:\d+:\".+\";|N;|O:\d+:\"\w+\":\d+:\{\w:\d+:)+|^O:\d+:\"\w+\":\d+:\{s:\d+:\"/';
- < return (is_string($data) && preg_match($pattern, $data));
- < }
- <
- 117,122c105,106
- < if ($this->validateDataSerialized($data)) {
- < if ($this->getProfile()) {
- < $this->getProfile()->getContainer()->setData($data);
- < }
- <
- < $this->_data = $data;
- ---
- > if ($this->getProfile()) {
- > $this->getProfile()->getContainer()->setData($data);
- 124c108
- <
- ---
- > $this->_data = $data;
- 128,155d111
- < /**
- < * Validate serialized data
- < *
- < * @param mixed $data
- < * @return bool
- < */
- < public function validateDataSerialized($data = null)
- < {
- < if (is_null($data)) {
- < $data = $this->getData();
- < }
- <
- < $result = true;
- < if ($this->isSerialized($data)) {
- < try {
- < $dataArray = Mage::helper('core/unserializeArray')->unserialize($data);
- < } catch (Exception $e) {
- < $result = false;
- < $this->addException(
- < "Invalid data, expecting serialized array.",
- < Mage_Dataflow_Model_Convert_Exception::FATAL
- < );
- < }
- < }
- <
- < return $result;
- < }
- <
- 187,190c143
- < $this->addException(
- < "Invalid data type, expecting 2D grid array.",
- < Mage_Dataflow_Model_Convert_Exception::FATAL
- < );
- ---
- > $this->addException("Invalid data type, expecting 2D grid array.", Mage_Dataflow_Model_Convert_Exception::FATAL);
- diff -r magento1933/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php magento1932/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php
- 65,66c65
- < $message = Mage::helper('dataflow')
- < ->__('Declared adapter %s was not found.', $adapterName);
- ---
- > $message = Mage::helper('dataflow')->__('Declared adapter %s was not found.', $adapterName);
- 72,73c71
- < $message = Mage::helper('dataflow')
- < ->__('Method "%s" not defined in adapter %s.', $adapterMethod, $adapterName);
- ---
- > $message = Mage::helper('dataflow')->__('Method "%s" not defined in adapter %s.', $adapterMethod, $adapterName);
- 82,83c80,81
- < $file = Mage::app()->getConfig()->getTempVarDir() . '/import/'
- < . str_replace('../', '', urldecode(Mage::app()->getRequest()->getParam('files')));
- ---
- > $file = Mage::app()->getConfig()->getTempVarDir().'/import/'
- > . urldecode(Mage::app()->getRequest()->getParam('files'));
- diff -r magento1933/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php magento1932/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php
- 72,73c72
- < $message = Mage::helper('dataflow')
- < ->__('Method "%s" was not defined in adapter %s.', $adapterMethod, $adapterName);
- ---
- > $message = Mage::helper('dataflow')->__('Method "%s" was not defined in adapter %s.', $adapterMethod, $adapterName);
- 82,83c81,82
- < $file = Mage::app()->getConfig()->getTempVarDir() . '/import/'
- < . str_replace('../', '', urldecode(Mage::app()->getRequest()->getParam('files')));
- ---
- > $file = Mage::app()->getConfig()->getTempVarDir().'/import/'
- > . urldecode(Mage::app()->getRequest()->getParam('files'));
- diff -r magento1933/app/code/core/Mage/ImportExport/Model/Import/Uploader.php magento1932/app/code/core/Mage/ImportExport/Model/Import/Uploader.php
- 64,68d63
- < $this->addValidateCallback(
- < Mage_Core_Model_File_Validator_Image::NAME,
- < Mage::getModel('core/file_validator_image'),
- < 'validate'
- < );
- diff -r magento1933/app/code/core/Mage/Paypal/Model/Config.php magento1932/app/code/core/Mage/Paypal/Model/Config.php
- 721,730d720
- < * Get postback endpoint URL.
- < *
- < * @return string
- < */
- < public function getPostbackUrl()
- < {
- < return sprintf('https://ipnpb.%spaypal.com/cgi-bin/webscr', $this->sandboxFlag ? 'sandbox.' : '');
- < }
- <
- < /**
- 1600a1591
- >
- diff -r magento1933/app/code/core/Mage/Paypal/Model/Ipn.php magento1932/app/code/core/Mage/Paypal/Model/Ipn.php
- 132d131
- < * @throws Exception
- 137c136
- < $postbackUrl = $this->_config->getPostbackUrl();
- ---
- > $postbackUrl = $this->_config->getPaypalUrl();
- diff -r magento1933/app/code/core/Mage/Sales/Model/Quote/Item.php magento1932/app/code/core/Mage/Sales/Model/Quote/Item.php
- 503,505c503,504
- < $_itemOptionValue =
- < is_numeric($itemOptionValue) ? $itemOptionValue : $parser->unserialize($itemOptionValue);
- < $_optionValue = is_numeric($optionValue) ? $optionValue : $parser->unserialize($optionValue);
- ---
- > $_itemOptionValue = $parser->unserialize($itemOptionValue);
- > $_optionValue = $parser->unserialize($optionValue);
- diff -r magento1933/app/code/core/Mage/Widget/Model/Widget/Instance.php magento1932/app/code/core/Mage/Widget/Model/Widget/Instance.php
- 350,354c350
- < try {
- < return Mage::helper('core/unserializeArray')->unserialize($this->getData('widget_parameters'));
- < } catch (Exception $e) {
- < Mage::logException($e);
- < }
- ---
- > return unserialize($this->getData('widget_parameters'));
- diff -r magento1933/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php magento1932/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php
- 1396,1400d1395
- < $uploader->addValidateCallback(
- < Mage_Core_Model_File_Validator_Image::NAME,
- < Mage::getModel('core/file_validator_image'),
- < 'validate'
- < );
- diff -r magento1933/app/code/core/Mage/XmlConnect/Helper/Image.php magento1932/app/code/core/Mage/XmlConnect/Helper/Image.php
- 103,107d102
- < $uploader->addValidateCallback(
- < Mage_Core_Model_File_Validator_Image::NAME,
- < Mage::getModel('core/file_validator_image'),
- < 'validate'
- < );
- diff -r magento1933/app/design/adminhtml/default/default/layout/main.xml magento1932/app/design/adminhtml/default/default/layout/main.xml
- 122,123c122
- < <block type="adminhtml/checkout_formkey" name="checkout_formkey" as="checkout_formkey" template="notification/formkey.phtml"/></block>
- < <block type="adminhtml/notification_symlink" name="notification_symlink" template="notification/symlink.phtml"/>
- ---
- > </block>
- Only in magento1933/app/design/adminhtml/default/default/template/notification: formkey.phtml
- Only in magento1933/app/design/adminhtml/default/default/template/notification: symlink.phtml
- diff -r magento1933/app/design/adminhtml/default/default/template/page/head.phtml magento1932/app/design/adminhtml/default/default/template/page/head.phtml
- 36c36
- < var SKIN_URL = '<?php echo $this->jsQuoteEscape($this->getSkinUrl()) ?>';
- ---
- > var SKIN_URL = '<?php echo $this->getSkinUrl() ?>';
- diff -r magento1933/app/design/frontend/base/default/template/checkout/cart/shipping.phtml magento1932/app/design/frontend/base/default/template/checkout/cart/shipping.phtml
- 112d111
- < <?php echo $this->getBlockHtml('formkey') ?>
- diff -r magento1933/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml magento1932/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml
- 94d93
- < <?php echo $this->getBlockHtml('formkey') ?>
- diff -r magento1933/app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml magento1932/app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml
- 129d128
- < <?php echo $this->getBlockHtml('formkey') ?>
- diff -r magento1933/app/design/frontend/base/default/template/checkout/onepage/billing.phtml magento1932/app/design/frontend/base/default/template/checkout/onepage/billing.phtml
- 204d203
- < <?php echo $this->getBlockHtml('formkey') ?>
- diff -r magento1933/app/design/frontend/base/default/template/checkout/onepage/payment.phtml magento1932/app/design/frontend/base/default/template/checkout/onepage/payment.phtml
- 39d38
- < <?php echo $this->getBlockHtml('formkey') ?>
- diff -r magento1933/app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml magento1932/app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml
- 46d45
- < <?php echo $this->getBlockHtml('formkey') ?>
- diff -r magento1933/app/design/frontend/base/default/template/checkout/onepage/shipping.phtml magento1932/app/design/frontend/base/default/template/checkout/onepage/shipping.phtml
- 144d143
- < <?php echo $this->getBlockHtml('formkey') ?>
- diff -r magento1933/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml magento1932/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml
- 202d201
- < <?php echo $this->getBlockHtml('formkey') ?>
- diff -r magento1933/app/design/frontend/rwd/default/layout/page.xml magento1932/app/design/frontend/rwd/default/layout/page.xml
- 39c39
- < <action method="addJs"><script>lib/jquery/jquery-1.12.0.min.js</script></action>
- ---
- > <action method="addJs"><script>lib/jquery/jquery-1.10.2.min.js</script></action>
- diff -r magento1933/app/design/frontend/rwd/default/template/checkout/cart/shipping.phtml magento1932/app/design/frontend/rwd/default/template/checkout/cart/shipping.phtml
- 123d122
- < <?php echo $this->getBlockHtml('formkey') ?>
- diff -r magento1933/app/design/frontend/rwd/default/template/checkout/multishipping/addresses.phtml magento1932/app/design/frontend/rwd/default/template/checkout/multishipping/addresses.phtml
- 87d86
- < <?php echo $this->getBlockHtml('formkey') ?>
- diff -r magento1933/app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml magento1932/app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml
- 96d95
- < <?php echo $this->getBlockHtml('formkey') ?>
- diff -r magento1933/app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml magento1932/app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml
- 40d39
- < <?php echo $this->getBlockHtml('formkey') ?>
- diff -r magento1933/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml magento1932/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
- 145d144
- < <?php echo $this->getBlockHtml('formkey') ?>
- diff -r magento1933/app/design/frontend/rwd/default/template/persistent/checkout/onepage/billing.phtml magento1932/app/design/frontend/rwd/default/template/persistent/checkout/onepage/billing.phtml
- 204d203
- < <?php echo $this->getBlockHtml('formkey') ?>
- diff -r magento1933/app/etc/config.xml magento1932/app/etc/config.xml
- 144,148d143
- < <dev>
- < <template>
- < <allow_symlink>0</allow_symlink>
- < </template>
- < </dev>
- diff -r magento1933/app/locale/en_US/Mage_Adminhtml.csv magento1932/app/locale/en_US/Mage_Adminhtml.csv
- 990d989
- < "Symlinks are enabled. This may expose security risks. We strongly recommend to disable them.","Symlinks are enabled. This may expose security risks. We strongly recommend to disable them."
- 1255d1253
- < "You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
- diff -r magento1933/app/locale/en_US/Mage_Checkout.csv magento1932/app/locale/en_US/Mage_Checkout.csv
- 124d123
- < "Enable Form Key Validation On Checkout","Enable Form Key Validation On Checkout"
- diff -r magento1933/app/locale/en_US/Mage_Core.csv magento1932/app/locale/en_US/Mage_Core.csv
- 172d171
- < "Invalid image.","Invalid image."
- diff -r magento1933/app/locale/en_US/Mage_Dataflow.csv magento1932/app/locale/en_US/Mage_Dataflow.csv
- 4,5d3
- < "Backend name ""Static"" not supported.","Backend name ""Static"" not supported."
- < "Backend name Static"" not supported.""","Backend name Static"" not supported."""
- diff -r magento1933/app/Mage.php magento1932/app/Mage.php
- 174c174
- < 'patch' => '3',
- ---
- > 'patch' => '2',
- diff -r magento1933/dev/tests/functional/tests/app/Mage/Admin/Test/Constraint/AssertUserAccessDeniedMessage.php magento1932/dev/tests/functional/tests/app/Mage/Admin/Test/Constraint/AssertUserAccessDeniedMessage.php
- 39c39
- < const INVALID_CREDENTIALS_MESSAGE = 'You did not sign in correctly or your account is temporarily disabled.';
- ---
- > const INVALID_CREDENTIALS_MESSAGE = 'Access denied.';
- diff -r magento1933/dev/tests/functional/tests/app/Mage/Admin/Test/Constraint/AssertUserAccountInactiveMessage.php magento1932/dev/tests/functional/tests/app/Mage/Admin/Test/Constraint/AssertUserAccountInactiveMessage.php
- 39c39
- < const INVALID_CREDENTIALS_MESSAGE = 'You did not sign in correctly or your account is temporarily disabled.';
- ---
- > const INVALID_CREDENTIALS_MESSAGE = 'This account is inactive.';
- diff -r magento1933/dev/tests/functional/tests/app/Mage/Admin/Test/Constraint/AssertUserIsLockedMessage.php magento1932/dev/tests/functional/tests/app/Mage/Admin/Test/Constraint/AssertUserIsLockedMessage.php
- 44c44
- < const ERROR_MESSAGE = 'You did not sign in correctly or your account is temporarily disabled.';
- ---
- > const ERROR_MESSAGE = 'This account is locked.';
- diff -r magento1933/dev/tests/functional/tests/app/Mage/Admin/Test/Constraint/AssertUserWrongCredentialsMessage.php magento1932/dev/tests/functional/tests/app/Mage/Admin/Test/Constraint/AssertUserWrongCredentialsMessage.php
- 41c41
- < const INVALID_CREDENTIALS_MESSAGE = 'You did not sign in correctly or your account is temporarily disabled.';
- ---
- > const INVALID_CREDENTIALS_MESSAGE = 'Invalid User Name or Password.';
- diff -r magento1933/dev/tests/functional/tests/app/Mage/Paypal/Test/Block/Login.php magento1932/dev/tests/functional/tests/app/Mage/Paypal/Test/Block/Login.php
- 122a123
- > $element = $this->switchOnPayPalFrame($element);
- 124c125
- < return parent::fill($customer, $this->switchOnPayPalFrame($element));
- ---
- > return parent::fill($customer, $element);
- diff -r magento1933/downloader/Maged/Connect.php magento1932/downloader/Maged/Connect.php
- 399,401c399
- < $validateKey = md5(time());
- < $sessionModel = new Maged_Model_Session();
- < $sessionModel->set('validate_cache_key', $validateKey); ?>
- ---
- > ?>
- 447d444
- < var validate_cache_key = '<?php echo $validateKey; ?>';
- 457c454
- < parameters: {clean_sessions:clean, maintenance:maintenance, validate_cache_key:validate_cache_key},
- ---
- > parameters: {clean_sessions:clean, maintenance:maintenance},
- diff -r magento1933/downloader/Maged/Controller.php magento1932/downloader/Maged/Controller.php
- 424c424
- < $result = $this->cleanCache(true);
- ---
- > $result = $this->cleanCache();
- 982,988c982
- < /**
- < * Clean cache
- < *
- < * @param bool $validate
- < * @return array
- < */
- < protected function cleanCache($validate = false)
- ---
- > protected function cleanCache()
- 994,1010c988,990
- < if ($validate) {
- < $result = $this->session()->validateCleanCacheKey();
- < }
- < if ($result) {
- < if (!empty($_REQUEST['clean_sessions'])) {
- < Mage::app()->cleanAllSessions();
- < $message .= 'Session cleaned successfully. ';
- < }
- < Mage::app()->cleanCache();
- <
- < // reinit config and apply all updates
- < Mage::app()->getConfig()->reinit();
- < Mage_Core_Model_Resource_Setup::applyAllUpdates();
- < Mage_Core_Model_Resource_Setup::applyAllDataUpdates();
- < $message .= 'Cache cleaned successfully';
- < } else {
- < $message .= 'Validation failed';
- ---
- > if (!empty($_REQUEST['clean_sessions'])) {
- > Mage::app()->cleanAllSessions();
- > $message .= 'Session cleaned successfully. ';
- 1011a992,1000
- > Mage::app()->cleanCache();
- >
- > // reinit config and apply all updates
- > Mage::app()->getConfig()->reinit();
- > Mage_Core_Model_Resource_Setup::applyAllUpdates();
- > Mage_Core_Model_Resource_Setup::applyAllDataUpdates();
- > $message .= 'Cache cleaned successfully';
- > } else {
- > $result = true;
- 1063c1052
- < 'patch' => '3',
- ---
- > 'patch' => '2',
- diff -r magento1933/downloader/Maged/Model/Session.php magento1932/downloader/Maged/Model/Session.php
- 85,98d84
- < * Unset value by key
- < *
- < * @param string $key
- < * @return $this
- < */
- < public function delete($key)
- < {
- < if (isset($_SESSION[$key])) {
- < unset($_SESSION[$key]);
- < }
- < return $this;
- < }
- <
- < /**
- 275,294d260
- < }
- <
- < /**
- < * Validate key for cache cleaning
- < *
- < * @return bool
- < */
- < public function validateCleanCacheKey()
- < {
- < $result = false;
- < $validateKey = $this->get('validate_cache_key');
- < if ($validateKey
- < && !empty($_REQUEST['validate_cache_key'])
- < && $validateKey == $_REQUEST['validate_cache_key']
- < ) {
- < $result = true;
- < }
- < $this->delete('validate_cache_key');
- <
- < return $result;
- Only in magento1933/js/lib/jquery: jquery-1.12.0.js
- Only in magento1933/js/lib/jquery: jquery-1.12.0.min.js
- Only in magento1933/js/lib/jquery: jquery-1.12.0.min.map
- diff -r magento1933/js/varien/payment.js magento1932/js/varien/payment.js
- 34c34
- < if (elements[i].name=='payment[method]' || elements[i].name=='form_key') {
- ---
- > if (elements[i].name=='payment[method]') {
- diff -r magento1933/RELEASE_NOTES.txt magento1932/RELEASE_NOTES.txt
- 1,10d0
- < ==== 1.9.3.3 ====
- < ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- < ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- < ] NOTE: Current Release Notes are maintained at: [
- < ] [
- < ] http://devdocs.magento.com/guides/m1x/ce19-ee114/ce1.9_release-notes.html [
- < ] [
- < ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- < ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- <
- diff -r magento1933/skin/frontend/base/default/js/opcheckout.js magento1932/skin/frontend/base/default/js/opcheckout.js
- 687c687
- < if (elements[i].name=='payment[method]' || elements[i].name == 'form_key') {
- ---
- > if (elements[i].name=='payment[method]') {
- Only in magento1932/var/package: Cm_RedisSession-1.9.3.2.xml
- Only in magento1933/var/package: Cm_RedisSession-1.9.3.3.xml
- Only in magento1932/var/package: Interface_Adminhtml_Default-1.9.3.2.xml
- Only in magento1933/var/package: Interface_Adminhtml_Default-1.9.3.3.xml
- Only in magento1932/var/package: Interface_Frontend_Base_Default-1.9.3.2.xml
- Only in magento1933/var/package: Interface_Frontend_Base_Default-1.9.3.3.xml
- Only in magento1932/var/package: Interface_Frontend_Default-1.9.3.2.xml
- Only in magento1933/var/package: Interface_Frontend_Default-1.9.3.3.xml
- Only in magento1932/var/package: Interface_Frontend_Rwd_Default-1.9.3.2.xml
- Only in magento1933/var/package: Interface_Frontend_Rwd_Default-1.9.3.3.xml
- Only in magento1932/var/package: Interface_Install_Default-1.9.3.2.xml
- Only in magento1933/var/package: Interface_Install_Default-1.9.3.3.xml
- Only in magento1932/var/package: Lib_Cm-1.9.3.2.xml
- Only in magento1933/var/package: Lib_Cm-1.9.3.3.xml
- Only in magento1932/var/package: Lib_Credis-1.9.3.2.xml
- Only in magento1933/var/package: Lib_Credis-1.9.3.3.xml
- Only in magento1932/var/package: Lib_Google_Checkout-1.9.3.2.xml
- Only in magento1933/var/package: Lib_Google_Checkout-1.9.3.3.xml
- Only in magento1932/var/package: Lib_IDNA2-1.9.3.2.xml
- Only in magento1933/var/package: Lib_IDNA2-1.9.3.3.xml
- Only in magento1932/var/package: Lib_Js_Calendar-1.51.1.8.xml
- Only in magento1933/var/package: Lib_Js_Calendar-1.51.1.9.xml
- Only in magento1932/var/package: Lib_Js_Ext-1.9.3.2.xml
- Only in magento1933/var/package: Lib_Js_Ext-1.9.3.3.xml
- Only in magento1932/var/package: Lib_Js_Mage-1.9.3.2.xml
- Only in magento1933/var/package: Lib_Js_Mage-1.9.3.3.xml
- Only in magento1932/var/package: Lib_Js_Prototype-1.9.3.2.xml
- Only in magento1933/var/package: Lib_Js_Prototype-1.9.3.3.xml
- Only in magento1932/var/package: Lib_Js_TinyMCE-3.5.11.7.xml
- Only in magento1933/var/package: Lib_Js_TinyMCE-3.5.11.8.xml
- Only in magento1932/var/package: Lib_LinLibertineFont-2.8.14.8.xml
- Only in magento1933/var/package: Lib_LinLibertineFont-2.8.14.9.xml
- Only in magento1932/var/package: Lib_Mage-1.9.3.2.xml
- Only in magento1933/var/package: Lib_Mage-1.9.3.3.xml
- Only in magento1932/var/package: Lib_Magento-1.9.3.2.xml
- Only in magento1933/var/package: Lib_Magento-1.9.3.3.xml
- Only in magento1932/var/package: Lib_Pelago-1.9.3.2.xml
- Only in magento1933/var/package: Lib_Pelago-1.9.3.3.xml
- Only in magento1932/var/package: Lib_Phpseclib-1.9.3.2.xml
- Only in magento1933/var/package: Lib_Phpseclib-1.9.3.3.xml
- Only in magento1932/var/package: Lib_Unserialize-1.9.3.2.xml
- Only in magento1933/var/package: Lib_Unserialize-1.9.3.3.xml
- Only in magento1932/var/package: Lib_Varien-1.9.3.2.xml
- Only in magento1933/var/package: Lib_Varien-1.9.3.3.xml
- Only in magento1932/var/package: Lib_ZF-1.12.10.7.xml
- Only in magento1933/var/package: Lib_ZF-1.12.10.8.xml
- Only in magento1932/var/package: Lib_ZF_Locale-1.12.10.7.xml
- Only in magento1933/var/package: Lib_ZF_Locale-1.12.10.8.xml
- Only in magento1932/var/package: Mage_All_Latest-1.9.3.2.xml
- Only in magento1933/var/package: Mage_All_Latest-1.9.3.3.xml
- Only in magento1932/var/package: Mage_Centinel-1.9.3.2.xml
- Only in magento1933/var/package: Mage_Centinel-1.9.3.3.xml
- Only in magento1932/var/package: Mage_Compiler-1.9.3.2.xml
- Only in magento1933/var/package: Mage_Compiler-1.9.3.3.xml
- Only in magento1932/var/package: Mage_Core_Adminhtml-1.9.3.2.xml
- Only in magento1933/var/package: Mage_Core_Adminhtml-1.9.3.3.xml
- Only in magento1932/var/package: Mage_Core_Modules-1.9.3.2.xml
- Only in magento1933/var/package: Mage_Core_Modules-1.9.3.3.xml
- Only in magento1932/var/package: Mage_Downloader-1.9.3.2.xml
- Only in magento1933/var/package: Mage_Downloader-1.9.3.3.xml
- Only in magento1932/var/package: Mage_Locale_en_US-1.9.3.2.xml
- Only in magento1933/var/package: Mage_Locale_en_US-1.9.3.3.xml
- Only in magento1932/var/package: Magento_Mobile-1.9.3.2.xml
- Only in magento1933/var/package: Magento_Mobile-1.9.3.3.xml
- Only in magento1932/var/package: Phoenix_Moneybookers-1.9.3.2.xml
- Only in magento1933/var/package: Phoenix_Moneybookers-1.9.3.3.xml
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement