Merge pull request OpenMage#645 from OpenMage/1.9.3.x

forward porting of 1.9.3.x into 1.9.4.x
IbrahimS2 · Apr 1, 2019 · f312600 · f312600
2 parents fd01dd8 + 2825eab
commit f312600
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 6 deletions.
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php
@@ -198,6 +198,7 @@ protected function _prepareMassaction()
  {
  $this->setMassactionIdField('subscriber_id');
  $this->getMassactionBlock()->setFormFieldName('subscriber');
+ $this->getMassactionBlock()->setUseSelectAll(false);
 
  $this->getMassactionBlock()->addItem('unsubscribe', array(
  'label' => Mage::helper('newsletter')->__('Unsubscribe'),

diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid.php
@@ -210,6 +210,7 @@ protected function _prepareMassaction()
  $this->setMassactionIdFilter('rt.review_id');
  $this->setMassactionIdFieldOnlyIndexValue(true);
  $this->getMassactionBlock()->setFormFieldName('reviews');
+ $this->getMassactionBlock()->setUseSelectAll(false);
 
  $this->getMassactionBlock()->addItem('delete', array(
  'label'=> Mage::helper('review')->__('Delete'),

diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
@@ -133,7 +133,7 @@ protected function _createSoapClient($wsdl, $trace = false)
  {
  $client = new SoapClient($wsdl, array('trace' => $trace));
  $client->__setLocation($this->getConfigFlag('sandbox_mode')
- ? 'https://wsbeta.fedex.com:443/web-services '
+ ? 'https://wsbeta.fedex.com:443/web-services'
  : 'https://ws.fedex.com:443/web-services'
  );
 

diff --git a/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/core/Mage/Usa/sql/usa_setup/upgrade-1.6.0.1-1.6.0.2.php
@@ -84,7 +84,7 @@
 $oldConfigValues = $connection->fetchAll($select);
 
 foreach ($oldConfigValues as $oldValue) {
- $newValue = '';
+ $newValue = array();
  if (stripos($oldValue['path'], 'free_method') && isset($oldToNewMethodCodesMap[$oldValue['value']])) {
  $newValue = $oldToNewMethodCodesMap[$oldValue['value']];
  } else if (stripos($oldValue['path'], 'allowed_methods')) {

diff --git a/js/mage/adminhtml/flexuploader.js b/js/mage/adminhtml/flexuploader.js
@@ -213,7 +213,7 @@ if(!window.Flex) {
 
  document.cookie = escape(response.cookie.name) + "="
  + escape(response.cookie.value)
- + "; expires=" + date.toGMTString()
+ + "; expires=" + date.toUTCString()
  + (response.cookie.path.blank() ? "" : "; path=" + response.cookie.path)
  + (response.cookie.domain.blank() ? "" : "; domain=" + response.cookie.domain);
  }

diff --git a/js/mage/adminhtml/tools.js b/js/mage/adminhtml/tools.js
@@ -525,7 +525,7 @@ var Cookie = {
  if (cookieLifeTime) {
  var date = new Date();
  date.setTime(date.getTime()+(cookieLifeTime*1000));
- expires = '; expires='+date.toGMTString();
+ expires = '; expires='+date.toUTCString();
  }
  var urlPath = '/' + BASE_URL.split('/').slice(3).join('/'); // Get relative path
  document.cookie = escape(cookieName) + "=" + escape(cookieValue) + expires + "; path=" + urlPath;

diff --git a/js/mage/cookies.js b/js/mage/cookies.js
@@ -39,7 +39,7 @@ Mage.Cookies.set = function(name, value){
  var domain = (argc > 4) ? argv[4] : Mage.Cookies.domain;
  var secure = (argc > 5) ? argv[5] : Mage.Cookies.secure;
  document.cookie = name + "=" + escape (value) +
- ((expires == null) ? "" : ("; expires=" + expires.toGMTString())) +
+ ((expires == null) ? "" : ("; expires=" + expires.toUTCString())) +
  ((path == null) ? "" : ("; path=" + path)) +
  ((domain == null) ? "" : ("; domain=" + domain)) +
  ((secure == true) ? "; secure" : "");

diff --git a/js/prototype/window.js b/js/prototype/window.js
@@ -1817,7 +1817,7 @@ var WindowUtilities = {
 
  setCookie: function(value, parameters) {
  document.cookie= parameters[0] + "=" + escape(value) +
- ((parameters[1]) ? "; expires=" + parameters[1].toGMTString() : "") +
+ ((parameters[1]) ? "; expires=" + parameters[1].toUTCString() : "") +
  ((parameters[2]) ? "; path=" + parameters[2] : "") +
  ((parameters[3]) ? "; domain=" + parameters[3] : "") +
  ((parameters[4]) ? "; secure" : "");