Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

forward porting of 1.9.3.x into 1.9.4.x #645

Merged
merged 4 commits into from
Apr 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
1 change: 1 addition & 0 deletions app/code/core/Mage/Adminhtml/Block/Review/Grid.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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')) {
Expand Down
2 changes: 1 addition & 1 deletion js/mage/adminhtml/flexuploader.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion js/mage/adminhtml/tools.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion js/mage/cookies.js
Original file line number Diff line number Diff line change
Expand Up @@ -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" : "");
Expand Down
2 changes: 1 addition & 1 deletion js/prototype/window.js
Original file line number Diff line number Diff line change
Expand Up @@ -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" : "");
Expand Down