Advertisement
Guest User

Magento 1933/1932 DIFF

a guest
Jun 1st, 2017
1,366
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff -r magento1933/app/code/core/Mage/Admin/Model/Session.php magento1932/app/code/core/Mage/Admin/Model/Session.php
  2. 141,143d140
  3. <             $e->setMessage(
  4. <                 Mage::helper('adminhtml')->__('You did not sign in correctly or your account is temporarily disabled.')
  5. <             );
  6. Only in magento1933/app/code/core/Mage/Adminhtml/Block/Checkout: Formkey.php
  7. Only in magento1933/app/code/core/Mage/Adminhtml/Block/Notification: Symlink.php
  8. 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
  9. 149c149
  10. <                 $value['from'] = $this->_convertDate($this->stripTags($value['from']), $value['locale']);
  11. ---
  12. >                 $value['from'] = $this->_convertDate($value['from'], $value['locale']);
  13. 153c153
  14. <                 $value['to'] = $this->_convertDate($this->stripTags($value['to']), $value['locale']);
  15. ---
  16. >                 $value['to'] = $this->_convertDate($value['to'], $value['locale']);
  17. diff -r magento1933/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php magento1932/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/GalleryController.php
  18. 45,49d44
  19. <             $uploader->addValidateCallback(
  20. <                 Mage_Core_Model_File_Validator_Image::NAME,
  21. <                 Mage::getModel('core/file_validator_image'),
  22. <                 'validate'
  23. <             );
  24. diff -r magento1933/app/code/core/Mage/Adminhtml/Model/Config/Data.php magento1932/app/code/core/Mage/Adminhtml/Model/Config/Data.php
  25. 170,172d169
  26. <                         if (!Mage::getSingleton('admin/session')->isAllowed($configPath)) {
  27. <                             Mage::throwException('Access denied.');
  28. <                         }
  29. diff -r magento1933/app/code/core/Mage/Checkout/controllers/MultishippingController.php magento1932/app/code/core/Mage/Checkout/controllers/MultishippingController.php
  30. 236,241d235
  31. <
  32. <         if ($this->isFormkeyValidationOnCheckoutEnabled() && !$this->_validateFormKey()) {
  33. <             $this->_redirect('*/*/addresses');
  34. <             return;
  35. <         }
  36. <
  37. 362,366d355
  38. <         if ($this->isFormkeyValidationOnCheckoutEnabled() && !$this->_validateFormKey()) {
  39. <             $this->_redirect('*/*/shipping');
  40. <             return;
  41. <         }
  42. <
  43. 474,478d462
  44. <         }
  45. <
  46. <         if ($this->isFormkeyValidationOnCheckoutEnabled() && !$this->_validateFormKey()) {
  47. <             $this->_redirect('*/*/billing');
  48. <             return;
  49. diff -r magento1933/app/code/core/Mage/Checkout/controllers/OnepageController.php magento1932/app/code/core/Mage/Checkout/controllers/OnepageController.php
  50. 352,356d351
  51. <
  52. <         if ($this->isFormkeyValidationOnCheckoutEnabled() && !$this->_validateFormKey()) {
  53. <             return;
  54. <         }
  55. <
  56. 372,376d366
  57. <
  58. <         if ($this->isFormkeyValidationOnCheckoutEnabled() && !$this->_validateFormKey()) {
  59. <             return;
  60. <         }
  61. <
  62. 419,423d408
  63. <
  64. <         if ($this->isFormkeyValidationOnCheckoutEnabled() && !$this->_validateFormKey()) {
  65. <             return;
  66. <         }
  67. <
  68. 448,452d432
  69. <
  70. <         if ($this->isFormkeyValidationOnCheckoutEnabled() && !$this->_validateFormKey()) {
  71. <             return;
  72. <         }
  73. <
  74. 487,491d466
  75. <
  76. <         if ($this->isFormkeyValidationOnCheckoutEnabled() && !$this->_validateFormKey()) {
  77. <             return;
  78. <         }
  79. <
  80. diff -r magento1933/app/code/core/Mage/Checkout/etc/system.xml magento1932/app/code/core/Mage/Checkout/etc/system.xml
  81. 235,252d234
  82. <         <admin>
  83. <             <groups>
  84. <                 <security>
  85. <                     <fields>
  86. <                         <validate_formkey_checkout translate="label">
  87. <                             <label>Enable Form Key Validation On Checkout</label>
  88. <                             <frontend_type>select</frontend_type>
  89. <                             <source_model>adminhtml/system_config_source_yesno</source_model>
  90. <                             <sort_order>4</sort_order>
  91. <                             <comment><![CDATA[<strong style="color:red">Important!</strong> Enabling this option means
  92. <                             that your custom templates used in checkout process contain form_key output.
  93. <                             Otherwise checkout may not work.]]></comment>
  94. <                             <show_in_default>1</show_in_default>
  95. <                         </validate_formkey_checkout>
  96. <                     </fields>
  97. <                 </security>
  98. <             </groups>
  99. <         </admin>
  100. diff -r magento1933/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php magento1932/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php
  101. 286,290d285
  102. <         $uploader->addValidateCallback(
  103. <             Mage_Core_Model_File_Validator_Image::NAME,
  104. <             Mage::getModel('core/file_validator_image'),
  105. <             'validate'
  106. <         );
  107. diff -r magento1933/app/code/core/Mage/Core/Controller/Front/Action.php magento1932/app/code/core/Mage/Core/Controller/Front/Action.php
  108. 191,200d190
  109. <
  110. <     /**
  111. <      * Check if form_key validation enabled on checkout process
  112. <      *
  113. <      * @return bool
  114. <      */
  115. <     protected function isFormkeyValidationOnCheckoutEnabled()
  116. <     {
  117. <         return Mage::getStoreConfigFlag('admin/security/validate_formkey_checkout');
  118. <     }
  119. diff -r magento1933/app/code/core/Mage/Core/Controller/Request/Http.php magento1932/app/code/core/Mage/Core/Controller/Request/Http.php
  120. 151,154c151
  121. <             if ($baseUrl && $pathInfo && (0 !== stripos($pathInfo, '/'))) {
  122. <                 $pathInfo = '';
  123. <                 $this->setActionName('noRoute');
  124. <             } elseif ((null !== $baseUrl) && (false === $pathInfo)) {
  125. ---
  126. >             if ((null !== $baseUrl) && (false === $pathInfo)) {
  127. diff -r magento1933/app/code/core/Mage/Core/etc/system.xml magento1932/app/code/core/Mage/Core/etc/system.xml
  128. 599a600,619
  129. >                 <template translate="label">
  130. >                     <label>Template Settings</label>
  131. >                     <frontend_type>text</frontend_type>
  132. >                     <sort_order>25</sort_order>
  133. >                     <show_in_default>1</show_in_default>
  134. >                     <show_in_website>1</show_in_website>
  135. >                     <show_in_store>1</show_in_store>
  136. >                     <fields>
  137. >                         <allow_symlink translate="label comment">
  138. >                             <label>Allow Symlinks</label>
  139. >                             <frontend_type>select</frontend_type>
  140. >                             <source_model>adminhtml/system_config_source_yesno</source_model>
  141. >                             <sort_order>10</sort_order>
  142. >                             <show_in_default>1</show_in_default>
  143. >                             <show_in_website>1</show_in_website>
  144. >                             <show_in_store>1</show_in_store>
  145. >                             <comment>Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.</comment>
  146. >                         </allow_symlink>
  147. >                     </fields>
  148. >                 </template>
  149. diff -r magento1933/app/code/core/Mage/Core/Model/File/Validator/Image.php magento1932/app/code/core/Mage/Core/Model/File/Validator/Image.php
  150. 91,117c91,94
  151. <         list($imageWidth, $imageHeight, $fileType) = getimagesize($filePath);
  152. <         if ($fileType) {
  153. <             if ($this->isImageType($fileType)) {
  154. <                 //replace tmp image with re-sampled copy to exclude images with malicious data
  155. <                 $image = imagecreatefromstring(file_get_contents($filePath));
  156. <                 if ($image !== false) {
  157. <                     $img = imagecreatetruecolor($imageWidth, $imageHeight);
  158. <                     imagecopyresampled($img, $image, 0, 0, 0, 0, $imageWidth, $imageHeight, $imageWidth, $imageHeight);
  159. <                     switch ($fileType) {
  160. <                         case IMAGETYPE_GIF:
  161. <                             imagegif($img, $filePath);
  162. <                             break;
  163. <                         case IMAGETYPE_JPEG:
  164. <                             imagejpeg($img, $filePath, 100);
  165. <                             break;
  166. <                         case IMAGETYPE_PNG:
  167. <                             imagepng($img, $filePath);
  168. <                             break;
  169. <                         default:
  170. <                             return;
  171. <                     }
  172. <                     imagedestroy($img);
  173. <                     imagedestroy($image);
  174. <                     return null;
  175. <                 } else {
  176. <                     throw Mage::exception('Mage_Core', Mage::helper('core')->__('Invalid image.'));
  177. <                 }
  178. ---
  179. >         $fileInfo = getimagesize($filePath);
  180. >         if (is_array($fileInfo) and isset($fileInfo[2])) {
  181. >             if ($this->isImageType($fileInfo[2])) {
  182. >                 return null;
  183. 131a109
  184. >
  185. 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
  186. 43,45d42
  187. <         if ($this->_resource->getBackend() instanceof Zend_Cache_Backend_Static) {
  188. <             throw new Exception(Mage::helper('dataflow')->__('Backend name "Static" not supported.'));
  189. <         }
  190. diff -r magento1933/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php magento1932/app/code/core/Mage/Dataflow/Model/Convert/Container/Abstract.php
  191. 50,61d49
  192. <     /**
  193. <      * Detect serialization of data
  194. <      *
  195. <      * @param mixed $data
  196. <      * @return bool
  197. <      */
  198. <     protected function isSerialized($data)
  199. <     {
  200. <         $pattern = '/^a:\d+:\{(i:\d+;|s:\d+:\".+\";|N;|O:\d+:\"\w+\":\d+:\{\w:\d+:)+|^O:\d+:\"\w+\":\d+:\{s:\d+:\"/';
  201. <         return (is_string($data) && preg_match($pattern, $data));
  202. <     }
  203. <
  204. 117,122c105,106
  205. <         if ($this->validateDataSerialized($data)) {
  206. <             if ($this->getProfile()) {
  207. <                 $this->getProfile()->getContainer()->setData($data);
  208. <             }
  209. <
  210. <             $this->_data = $data;
  211. ---
  212. >         if ($this->getProfile()) {
  213. >             $this->getProfile()->getContainer()->setData($data);
  214. 124c108
  215. <
  216. ---
  217. >         $this->_data = $data;
  218. 128,155d111
  219. <     /**
  220. <      * Validate serialized data
  221. <      *
  222. <      * @param mixed $data
  223. <      * @return bool
  224. <      */
  225. <     public function validateDataSerialized($data = null)
  226. <     {
  227. <         if (is_null($data)) {
  228. <             $data = $this->getData();
  229. <         }
  230. <
  231. <         $result = true;
  232. <         if ($this->isSerialized($data)) {
  233. <             try {
  234. <                 $dataArray = Mage::helper('core/unserializeArray')->unserialize($data);
  235. <             } catch (Exception $e) {
  236. <                 $result = false;
  237. <                 $this->addException(
  238. <                     "Invalid data, expecting serialized array.",
  239. <                     Mage_Dataflow_Model_Convert_Exception::FATAL
  240. <                 );
  241. <             }
  242. <         }
  243. <
  244. <         return $result;
  245. <     }
  246. <
  247. 187,190c143
  248. <             $this->addException(
  249. <                 "Invalid data type, expecting 2D grid array.",
  250. <                 Mage_Dataflow_Model_Convert_Exception::FATAL
  251. <             );
  252. ---
  253. >             $this->addException("Invalid data type, expecting 2D grid array.", Mage_Dataflow_Model_Convert_Exception::FATAL);
  254. diff -r magento1933/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php magento1932/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php
  255. 65,66c65
  256. <             $message = Mage::helper('dataflow')
  257. <                 ->__('Declared adapter %s was not found.', $adapterName);
  258. ---
  259. >             $message = Mage::helper('dataflow')->__('Declared adapter %s was not found.', $adapterName);
  260. 72,73c71
  261. <             $message = Mage::helper('dataflow')
  262. <                 ->__('Method "%s" not defined in adapter %s.', $adapterMethod, $adapterName);
  263. ---
  264. >             $message = Mage::helper('dataflow')->__('Method "%s" not defined in adapter %s.', $adapterMethod, $adapterName);
  265. 82,83c80,81
  266. <             $file = Mage::app()->getConfig()->getTempVarDir() . '/import/'
  267. <                 . str_replace('../', '', urldecode(Mage::app()->getRequest()->getParam('files')));
  268. ---
  269. >             $file = Mage::app()->getConfig()->getTempVarDir().'/import/'
  270. >                 . urldecode(Mage::app()->getRequest()->getParam('files'));
  271. 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
  272. 72,73c72
  273. <             $message = Mage::helper('dataflow')
  274. <                 ->__('Method "%s" was not defined in adapter %s.', $adapterMethod, $adapterName);
  275. ---
  276. >             $message = Mage::helper('dataflow')->__('Method "%s" was not defined in adapter %s.', $adapterMethod, $adapterName);
  277. 82,83c81,82
  278. <             $file = Mage::app()->getConfig()->getTempVarDir() . '/import/'
  279. <                 . str_replace('../', '', urldecode(Mage::app()->getRequest()->getParam('files')));
  280. ---
  281. >             $file = Mage::app()->getConfig()->getTempVarDir().'/import/'
  282. >                 . urldecode(Mage::app()->getRequest()->getParam('files'));
  283. diff -r magento1933/app/code/core/Mage/ImportExport/Model/Import/Uploader.php magento1932/app/code/core/Mage/ImportExport/Model/Import/Uploader.php
  284. 64,68d63
  285. <         $this->addValidateCallback(
  286. <             Mage_Core_Model_File_Validator_Image::NAME,
  287. <             Mage::getModel('core/file_validator_image'),
  288. <             'validate'
  289. <         );
  290. diff -r magento1933/app/code/core/Mage/Paypal/Model/Config.php magento1932/app/code/core/Mage/Paypal/Model/Config.php
  291. 721,730d720
  292. <      * Get postback endpoint URL.
  293. <      *
  294. <      * @return string
  295. <      */
  296. <     public function getPostbackUrl()
  297. <     {
  298. <         return sprintf('https://ipnpb.%spaypal.com/cgi-bin/webscr', $this->sandboxFlag ? 'sandbox.' : '');
  299. <     }
  300. <
  301. <     /**
  302. 1600a1591
  303. >
  304. diff -r magento1933/app/code/core/Mage/Paypal/Model/Ipn.php magento1932/app/code/core/Mage/Paypal/Model/Ipn.php
  305. 132d131
  306. <      * @throws Exception
  307. 137c136
  308. <         $postbackUrl = $this->_config->getPostbackUrl();
  309. ---
  310. >         $postbackUrl = $this->_config->getPaypalUrl();
  311. diff -r magento1933/app/code/core/Mage/Sales/Model/Quote/Item.php magento1932/app/code/core/Mage/Sales/Model/Quote/Item.php
  312. 503,505c503,504
  313. <                         $_itemOptionValue =
  314. <                             is_numeric($itemOptionValue) ? $itemOptionValue : $parser->unserialize($itemOptionValue);
  315. <                         $_optionValue = is_numeric($optionValue) ? $optionValue : $parser->unserialize($optionValue);
  316. ---
  317. >                         $_itemOptionValue = $parser->unserialize($itemOptionValue);
  318. >                         $_optionValue = $parser->unserialize($optionValue);
  319. diff -r magento1933/app/code/core/Mage/Widget/Model/Widget/Instance.php magento1932/app/code/core/Mage/Widget/Model/Widget/Instance.php
  320. 350,354c350
  321. <             try {
  322. <                 return Mage::helper('core/unserializeArray')->unserialize($this->getData('widget_parameters'));
  323. <             } catch (Exception $e) {
  324. <                 Mage::logException($e);
  325. <             }
  326. ---
  327. >             return unserialize($this->getData('widget_parameters'));
  328. diff -r magento1933/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php magento1932/app/code/core/Mage/XmlConnect/controllers/Adminhtml/MobileController.php
  329. 1396,1400d1395
  330. <             $uploader->addValidateCallback(
  331. <                 Mage_Core_Model_File_Validator_Image::NAME,
  332. <                 Mage::getModel('core/file_validator_image'),
  333. <                 'validate'
  334. <             );
  335. diff -r magento1933/app/code/core/Mage/XmlConnect/Helper/Image.php magento1932/app/code/core/Mage/XmlConnect/Helper/Image.php
  336. 103,107d102
  337. <             $uploader->addValidateCallback(
  338. <                 Mage_Core_Model_File_Validator_Image::NAME,
  339. <                 Mage::getModel('core/file_validator_image'),
  340. <                 'validate'
  341. <             );
  342. diff -r magento1933/app/design/adminhtml/default/default/layout/main.xml magento1932/app/design/adminhtml/default/default/layout/main.xml
  343. 122,123c122
  344. <                 <block type="adminhtml/checkout_formkey" name="checkout_formkey" as="checkout_formkey" template="notification/formkey.phtml"/></block>
  345. <                 <block type="adminhtml/notification_symlink" name="notification_symlink" template="notification/symlink.phtml"/>
  346. ---
  347. >             </block>
  348. Only in magento1933/app/design/adminhtml/default/default/template/notification: formkey.phtml
  349. Only in magento1933/app/design/adminhtml/default/default/template/notification: symlink.phtml
  350. diff -r magento1933/app/design/adminhtml/default/default/template/page/head.phtml magento1932/app/design/adminhtml/default/default/template/page/head.phtml
  351. 36c36
  352. <     var SKIN_URL = '<?php echo $this->jsQuoteEscape($this->getSkinUrl()) ?>';
  353. ---
  354. >     var SKIN_URL = '<?php echo $this->getSkinUrl() ?>';
  355. diff -r magento1933/app/design/frontend/base/default/template/checkout/cart/shipping.phtml magento1932/app/design/frontend/base/default/template/checkout/cart/shipping.phtml
  356. 112d111
  357. <             <?php echo $this->getBlockHtml('formkey') ?>
  358. diff -r magento1933/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml magento1932/app/design/frontend/base/default/template/checkout/multishipping/billing.phtml
  359. 94d93
  360. <         <?php echo $this->getBlockHtml('formkey') ?>
  361. diff -r magento1933/app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml magento1932/app/design/frontend/base/default/template/checkout/multishipping/shipping.phtml
  362. 129d128
  363. <         <?php echo $this->getBlockHtml('formkey') ?>
  364. diff -r magento1933/app/design/frontend/base/default/template/checkout/onepage/billing.phtml magento1932/app/design/frontend/base/default/template/checkout/onepage/billing.phtml
  365. 204d203
  366. <     <?php echo $this->getBlockHtml('formkey') ?>
  367. diff -r magento1933/app/design/frontend/base/default/template/checkout/onepage/payment.phtml magento1932/app/design/frontend/base/default/template/checkout/onepage/payment.phtml
  368. 39d38
  369. <         <?php echo $this->getBlockHtml('formkey') ?>
  370. 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
  371. 46d45
  372. <     <?php echo $this->getBlockHtml('formkey') ?>
  373. diff -r magento1933/app/design/frontend/base/default/template/checkout/onepage/shipping.phtml magento1932/app/design/frontend/base/default/template/checkout/onepage/shipping.phtml
  374. 144d143
  375. <     <?php echo $this->getBlockHtml('formkey') ?>
  376. 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
  377. 202d201
  378. <     <?php echo $this->getBlockHtml('formkey') ?>
  379. diff -r magento1933/app/design/frontend/rwd/default/layout/page.xml magento1932/app/design/frontend/rwd/default/layout/page.xml
  380. 39c39
  381. <                 <action method="addJs"><script>lib/jquery/jquery-1.12.0.min.js</script></action>
  382. ---
  383. >                 <action method="addJs"><script>lib/jquery/jquery-1.10.2.min.js</script></action>
  384. diff -r magento1933/app/design/frontend/rwd/default/template/checkout/cart/shipping.phtml magento1932/app/design/frontend/rwd/default/template/checkout/cart/shipping.phtml
  385. 123d122
  386. <             <?php echo $this->getBlockHtml('formkey') ?>
  387. diff -r magento1933/app/design/frontend/rwd/default/template/checkout/multishipping/addresses.phtml magento1932/app/design/frontend/rwd/default/template/checkout/multishipping/addresses.phtml
  388. 87d86
  389. <     <?php echo $this->getBlockHtml('formkey') ?>
  390. diff -r magento1933/app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml magento1932/app/design/frontend/rwd/default/template/checkout/multishipping/billing.phtml
  391. 96d95
  392. <         <?php echo $this->getBlockHtml('formkey') ?>
  393. diff -r magento1933/app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml magento1932/app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml
  394. 40d39
  395. <         <?php echo $this->getBlockHtml('formkey') ?>
  396. diff -r magento1933/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml magento1932/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
  397. 145d144
  398. <     <?php echo $this->getBlockHtml('formkey') ?>
  399. 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
  400. 204d203
  401. <     <?php echo $this->getBlockHtml('formkey') ?>
  402. diff -r magento1933/app/etc/config.xml magento1932/app/etc/config.xml
  403. 144,148d143
  404. <         <dev>
  405. <             <template>
  406. <                 <allow_symlink>0</allow_symlink>
  407. <             </template>
  408. <         </dev>
  409. diff -r magento1933/app/locale/en_US/Mage_Adminhtml.csv magento1932/app/locale/en_US/Mage_Adminhtml.csv
  410. 990d989
  411. < "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."
  412. 1255d1253
  413. < "You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
  414. diff -r magento1933/app/locale/en_US/Mage_Checkout.csv magento1932/app/locale/en_US/Mage_Checkout.csv
  415. 124d123
  416. < "Enable Form Key Validation On Checkout","Enable Form Key Validation On Checkout"
  417. diff -r magento1933/app/locale/en_US/Mage_Core.csv magento1932/app/locale/en_US/Mage_Core.csv
  418. 172d171
  419. < "Invalid image.","Invalid image."
  420. diff -r magento1933/app/locale/en_US/Mage_Dataflow.csv magento1932/app/locale/en_US/Mage_Dataflow.csv
  421. 4,5d3
  422. < "Backend name ""Static"" not supported.","Backend name ""Static"" not supported."
  423. < "Backend name Static"" not supported.""","Backend name Static"" not supported."""
  424. diff -r magento1933/app/Mage.php magento1932/app/Mage.php
  425. 174c174
  426. <             'patch'     => '3',
  427. ---
  428. >             'patch'     => '2',
  429. 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
  430. 39c39
  431. <     const INVALID_CREDENTIALS_MESSAGE = 'You did not sign in correctly or your account is temporarily disabled.';
  432. ---
  433. >     const INVALID_CREDENTIALS_MESSAGE = 'Access denied.';
  434. 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
  435. 39c39
  436. <     const INVALID_CREDENTIALS_MESSAGE = 'You did not sign in correctly or your account is temporarily disabled.';
  437. ---
  438. >     const INVALID_CREDENTIALS_MESSAGE = 'This account is inactive.';
  439. 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
  440. 44c44
  441. <     const ERROR_MESSAGE = 'You did not sign in correctly or your account is temporarily disabled.';
  442. ---
  443. >     const ERROR_MESSAGE = 'This account is locked.';
  444. 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
  445. 41c41
  446. <     const INVALID_CREDENTIALS_MESSAGE = 'You did not sign in correctly or your account is temporarily disabled.';
  447. ---
  448. >     const INVALID_CREDENTIALS_MESSAGE = 'Invalid User Name or Password.';
  449. 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
  450. 122a123
  451. >         $element = $this->switchOnPayPalFrame($element);
  452. 124c125
  453. <         return parent::fill($customer, $this->switchOnPayPalFrame($element));
  454. ---
  455. >         return parent::fill($customer, $element);
  456. diff -r magento1933/downloader/Maged/Connect.php magento1932/downloader/Maged/Connect.php
  457. 399,401c399
  458. <             $validateKey = md5(time());
  459. <             $sessionModel = new Maged_Model_Session();
  460. <             $sessionModel->set('validate_cache_key', $validateKey); ?>
  461. ---
  462. > ?>
  463. 447d444
  464. <     var validate_cache_key = '<?php echo $validateKey; ?>';
  465. 457c454
  466. <         parameters: {clean_sessions:clean, maintenance:maintenance, validate_cache_key:validate_cache_key},
  467. ---
  468. >         parameters: {clean_sessions:clean, maintenance:maintenance},
  469. diff -r magento1933/downloader/Maged/Controller.php magento1932/downloader/Maged/Controller.php
  470. 424c424
  471. <         $result = $this->cleanCache(true);
  472. ---
  473. >         $result = $this->cleanCache();
  474. 982,988c982
  475. <     /**
  476. <      * Clean cache
  477. <      *
  478. <      * @param bool $validate
  479. <      * @return array
  480. <      */
  481. <     protected function cleanCache($validate = false)
  482. ---
  483. >     protected function cleanCache()
  484. 994,1010c988,990
  485. <                 if ($validate) {
  486. <                     $result = $this->session()->validateCleanCacheKey();
  487. <                 }
  488. <                 if ($result) {
  489. <                     if (!empty($_REQUEST['clean_sessions'])) {
  490. <                         Mage::app()->cleanAllSessions();
  491. <                         $message .= 'Session cleaned successfully. ';
  492. <                     }
  493. <                     Mage::app()->cleanCache();
  494. <
  495. <                     // reinit config and apply all updates
  496. <                     Mage::app()->getConfig()->reinit();
  497. <                     Mage_Core_Model_Resource_Setup::applyAllUpdates();
  498. <                     Mage_Core_Model_Resource_Setup::applyAllDataUpdates();
  499. <                     $message .= 'Cache cleaned successfully';
  500. <                 } else {
  501. <                     $message .= 'Validation failed';
  502. ---
  503. >                 if (!empty($_REQUEST['clean_sessions'])) {
  504. >                     Mage::app()->cleanAllSessions();
  505. >                     $message .= 'Session cleaned successfully. ';
  506. 1011a992,1000
  507. >                 Mage::app()->cleanCache();
  508. >
  509. >                 // reinit config and apply all updates
  510. >                 Mage::app()->getConfig()->reinit();
  511. >                 Mage_Core_Model_Resource_Setup::applyAllUpdates();
  512. >                 Mage_Core_Model_Resource_Setup::applyAllDataUpdates();
  513. >                 $message .= 'Cache cleaned successfully';
  514. >             } else {
  515. >                 $result = true;
  516. 1063c1052
  517. <             'patch'     => '3',
  518. ---
  519. >             'patch'     => '2',
  520. diff -r magento1933/downloader/Maged/Model/Session.php magento1932/downloader/Maged/Model/Session.php
  521. 85,98d84
  522. <      * Unset value by key
  523. <      *
  524. <      * @param string $key
  525. <      * @return $this
  526. <      */
  527. <     public function delete($key)
  528. <     {
  529. <         if (isset($_SESSION[$key])) {
  530. <             unset($_SESSION[$key]);
  531. <         }
  532. <         return $this;
  533. <     }
  534. <
  535. <     /**
  536. 275,294d260
  537. <     }
  538. <
  539. <     /**
  540. <      * Validate key for cache cleaning
  541. <      *
  542. <      * @return bool
  543. <      */
  544. <     public function validateCleanCacheKey()
  545. <     {
  546. <         $result = false;
  547. <         $validateKey = $this->get('validate_cache_key');
  548. <         if ($validateKey
  549. <             && !empty($_REQUEST['validate_cache_key'])
  550. <             && $validateKey == $_REQUEST['validate_cache_key']
  551. <         ) {
  552. <             $result = true;
  553. <         }
  554. <         $this->delete('validate_cache_key');
  555. <
  556. <         return $result;
  557. Only in magento1933/js/lib/jquery: jquery-1.12.0.js
  558. Only in magento1933/js/lib/jquery: jquery-1.12.0.min.js
  559. Only in magento1933/js/lib/jquery: jquery-1.12.0.min.map
  560. diff -r magento1933/js/varien/payment.js magento1932/js/varien/payment.js
  561. 34c34
  562. <             if (elements[i].name=='payment[method]' || elements[i].name=='form_key') {
  563. ---
  564. >             if (elements[i].name=='payment[method]') {
  565. diff -r magento1933/RELEASE_NOTES.txt magento1932/RELEASE_NOTES.txt
  566. 1,10d0
  567. < ==== 1.9.3.3 ====
  568. < ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  569. < ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  570. < ] NOTE: Current Release Notes are maintained at:                                                                              [
  571. < ]                                                                                                                             [
  572. < ] http://devdocs.magento.com/guides/m1x/ce19-ee114/ce1.9_release-notes.html                                                   [
  573. < ]                                                                                                                             [
  574. < ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  575. < ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  576. <
  577. diff -r magento1933/skin/frontend/base/default/js/opcheckout.js magento1932/skin/frontend/base/default/js/opcheckout.js
  578. 687c687
  579. <             if (elements[i].name=='payment[method]' || elements[i].name == 'form_key') {
  580. ---
  581. >             if (elements[i].name=='payment[method]') {
  582.     Only in magento1932/var/package: Cm_RedisSession-1.9.3.2.xml
  583.     Only in magento1933/var/package: Cm_RedisSession-1.9.3.3.xml
  584.     Only in magento1932/var/package: Interface_Adminhtml_Default-1.9.3.2.xml
  585.     Only in magento1933/var/package: Interface_Adminhtml_Default-1.9.3.3.xml
  586.     Only in magento1932/var/package: Interface_Frontend_Base_Default-1.9.3.2.xml
  587.     Only in magento1933/var/package: Interface_Frontend_Base_Default-1.9.3.3.xml
  588.     Only in magento1932/var/package: Interface_Frontend_Default-1.9.3.2.xml
  589.     Only in magento1933/var/package: Interface_Frontend_Default-1.9.3.3.xml
  590.     Only in magento1932/var/package: Interface_Frontend_Rwd_Default-1.9.3.2.xml
  591.     Only in magento1933/var/package: Interface_Frontend_Rwd_Default-1.9.3.3.xml
  592.     Only in magento1932/var/package: Interface_Install_Default-1.9.3.2.xml
  593.     Only in magento1933/var/package: Interface_Install_Default-1.9.3.3.xml
  594.     Only in magento1932/var/package: Lib_Cm-1.9.3.2.xml
  595.     Only in magento1933/var/package: Lib_Cm-1.9.3.3.xml
  596.     Only in magento1932/var/package: Lib_Credis-1.9.3.2.xml
  597.     Only in magento1933/var/package: Lib_Credis-1.9.3.3.xml
  598.     Only in magento1932/var/package: Lib_Google_Checkout-1.9.3.2.xml
  599.     Only in magento1933/var/package: Lib_Google_Checkout-1.9.3.3.xml
  600.     Only in magento1932/var/package: Lib_IDNA2-1.9.3.2.xml
  601.     Only in magento1933/var/package: Lib_IDNA2-1.9.3.3.xml
  602.     Only in magento1932/var/package: Lib_Js_Calendar-1.51.1.8.xml
  603.     Only in magento1933/var/package: Lib_Js_Calendar-1.51.1.9.xml
  604.     Only in magento1932/var/package: Lib_Js_Ext-1.9.3.2.xml
  605.     Only in magento1933/var/package: Lib_Js_Ext-1.9.3.3.xml
  606.     Only in magento1932/var/package: Lib_Js_Mage-1.9.3.2.xml
  607.     Only in magento1933/var/package: Lib_Js_Mage-1.9.3.3.xml
  608.     Only in magento1932/var/package: Lib_Js_Prototype-1.9.3.2.xml
  609.     Only in magento1933/var/package: Lib_Js_Prototype-1.9.3.3.xml
  610.     Only in magento1932/var/package: Lib_Js_TinyMCE-3.5.11.7.xml
  611.     Only in magento1933/var/package: Lib_Js_TinyMCE-3.5.11.8.xml
  612.     Only in magento1932/var/package: Lib_LinLibertineFont-2.8.14.8.xml
  613.     Only in magento1933/var/package: Lib_LinLibertineFont-2.8.14.9.xml
  614.     Only in magento1932/var/package: Lib_Mage-1.9.3.2.xml
  615.     Only in magento1933/var/package: Lib_Mage-1.9.3.3.xml
  616.     Only in magento1932/var/package: Lib_Magento-1.9.3.2.xml
  617.     Only in magento1933/var/package: Lib_Magento-1.9.3.3.xml
  618.     Only in magento1932/var/package: Lib_Pelago-1.9.3.2.xml
  619.     Only in magento1933/var/package: Lib_Pelago-1.9.3.3.xml
  620.     Only in magento1932/var/package: Lib_Phpseclib-1.9.3.2.xml
  621.     Only in magento1933/var/package: Lib_Phpseclib-1.9.3.3.xml
  622.     Only in magento1932/var/package: Lib_Unserialize-1.9.3.2.xml
  623.     Only in magento1933/var/package: Lib_Unserialize-1.9.3.3.xml
  624.     Only in magento1932/var/package: Lib_Varien-1.9.3.2.xml
  625.     Only in magento1933/var/package: Lib_Varien-1.9.3.3.xml
  626.     Only in magento1932/var/package: Lib_ZF-1.12.10.7.xml
  627.     Only in magento1933/var/package: Lib_ZF-1.12.10.8.xml
  628.     Only in magento1932/var/package: Lib_ZF_Locale-1.12.10.7.xml
  629.     Only in magento1933/var/package: Lib_ZF_Locale-1.12.10.8.xml
  630.     Only in magento1932/var/package: Mage_All_Latest-1.9.3.2.xml
  631.     Only in magento1933/var/package: Mage_All_Latest-1.9.3.3.xml
  632.     Only in magento1932/var/package: Mage_Centinel-1.9.3.2.xml
  633.     Only in magento1933/var/package: Mage_Centinel-1.9.3.3.xml
  634.     Only in magento1932/var/package: Mage_Compiler-1.9.3.2.xml
  635.     Only in magento1933/var/package: Mage_Compiler-1.9.3.3.xml
  636.     Only in magento1932/var/package: Mage_Core_Adminhtml-1.9.3.2.xml
  637.     Only in magento1933/var/package: Mage_Core_Adminhtml-1.9.3.3.xml
  638.     Only in magento1932/var/package: Mage_Core_Modules-1.9.3.2.xml
  639.     Only in magento1933/var/package: Mage_Core_Modules-1.9.3.3.xml
  640.     Only in magento1932/var/package: Mage_Downloader-1.9.3.2.xml
  641.     Only in magento1933/var/package: Mage_Downloader-1.9.3.3.xml
  642.     Only in magento1932/var/package: Mage_Locale_en_US-1.9.3.2.xml
  643.     Only in magento1933/var/package: Mage_Locale_en_US-1.9.3.3.xml
  644.     Only in magento1932/var/package: Magento_Mobile-1.9.3.2.xml
  645.     Only in magento1933/var/package: Magento_Mobile-1.9.3.3.xml
  646.     Only in magento1932/var/package: Phoenix_Moneybookers-1.9.3.2.xml
  647.     Only in magento1933/var/package: Phoenix_Moneybookers-1.9.3.3.xml
Advertisement
Advertisement
Advertisement
RAW Paste Data Copied
Advertisement