This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php b/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php | |
index 773c781..4801473 100644 | |
--- a/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php | |
+++ b/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php | |
@@ -140,7 +140,7 @@ class Mage_Core_Model_Url_Rewrite_Request | |
$fromStore = $this->_request->getQuery('___from_store'); | |
if (!$this->_rewrite->getId() && $fromStore) { | |
- $stores = $this->_app->getStores(); | |
+ $stores = $this->_app->getStores(false, true); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
# Patch apllying tool template | |
# v0.1.2 | |
# (c) Copyright 2013. Magento Inc. | |
# | |
# DO NOT CHANGE ANY LINE IN THIS FILE. | |
# 1. Check required system tools | |
_check_installed_tools() { | |
local missed="" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
# Patch apllying tool template | |
# v0.1.2 | |
# (c) Copyright 2013. Magento Inc. | |
# | |
# DO NOT CHANGE ANY LINE IN THIS FILE. | |
# 1. Check required system tools | |
_check_installed_tools() { | |
local missed="" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php | |
index 2de62ed..c284811 100644 | |
--- a/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php | |
+++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php | |
@@ -227,6 +227,8 @@ class Mage_ConfigurableSwatches_Helper_Productimg extends Mage_Core_Helper_Abstr | |
$fileExt = self::SWATCH_FILE_EXT; | |
} | |
+ // normalize to all lower case so that value can be used as array key below | |
+ $value = Mage_ConfigurableSwatches_Helper_Data::normalizeKey($value); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Commerce Bug http://store.pulsestorm.net/products/commerce-bug-2 | |
Magicento http://magicento.com/ | |
n98-magerun https://github.com/netz98/n98-magerun | |
Modman https://github.com/colinmollenhour/modman | |
AOE_Profiler https://github.com/AOEpeople/Aoe_Profiler |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: downloader/lib/Mage/HTTP/Client/Curl.php | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- downloader/lib/Mage/HTTP/Client/Curl.php (revision 70e08f1032574126d01d9c7022d9bdafa1c27303) | |
+++ downloader/lib/Mage/HTTP/Client/Curl.php (revision ) | |
@@ -374,7 +374,7 @@ | |
$this->_ch = curl_init(); | |
$this->curlOption(CURLOPT_URL, $uriModified); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
### Keybase proof | |
I hereby claim: | |
* I am piotrekkaminski on github. | |
* I am piotrekkaminski (https://keybase.io/piotrekkaminski) on keybase. | |
* I have a public key whose fingerprint is 5C18 197D 1390 24D9 8973 0F57 6968 AA3A 830C 1DB3 | |
To claim this, I am signing this object: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: dev/tests/functional/tests/app/Mage/Adminhtml/Test/Constraint/AssertProductIsPresentOnCustomWebsite.php | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- dev/tests/functional/tests/app/Mage/Adminhtml/Test/Constraint/AssertProductIsPresentOnCustomWebsite.php (revision 133010710c8351e2bc0f3d64631a99633732a7c1) | |
+++ dev/tests/functional/tests/app/Mage/Adminhtml/Test/Constraint/AssertProductIsPresentOnCustomWebsite.php (revision ) | |
@@ -34,7 +34,6 @@ | |
use Magento\Mtf\Fixture\FixtureFactory; | |
use Magento\Mtf\Fixture\InjectableFixture; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: dev/tests/functional/tests/app/Mage/CatalogRule/Test/Repository/CatalogRule.xml | |
IDEA additional info: | |
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP | |
<+>UTF-8 | |
=================================================================== | |
--- dev/tests/functional/tests/app/Mage/CatalogRule/Test/Repository/CatalogRule.xml (revision 133010710c8351e2bc0f3d64631a99633732a7c1) | |
+++ dev/tests/functional/tests/app/Mage/CatalogRule/Test/Repository/CatalogRule.xml (revision ) | |
@@ -33,7 +33,9 @@ | |
<field name="description" xsi:type="string">-50% of price, Priority = 0</field> | |
<field name="is_active" xsi:type="string">Active</field> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
# Patch apllying tool template | |
# v0.1.2 | |
# (c) Copyright 2013. Magento Inc. | |
# | |
# DO NOT CHANGE ANY LINE IN THIS FILE. | |
# 1. Check required system tools | |
_check_installed_tools() { | |
local missed="" |
OlderNewer