forked from OpenMage/magento-lts
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Added missing functionality for getThumbnailUrl
* Import Magento Release 1.9.3.2
This is part 1 of 2 and covers all the non-copyright messages changes
Fingerprint of original file:
> openssl sha1 magento-1.9.3.2-2017-02-07-01-57-07.tar.bz2
SHA1(magento-1.9.3.2-2017-02-07-01-57-07.tar.bz2)= 16d15f00a1898c4706b4bcf5501d9aa360c87f5b
Commands used:
> cd magento-mirror
> rm -rf * .ht*
> tar xvf ../magento-1.9.3.2-2017-02-07-01-57-07.tar.bz2 --strip-components=1
> LC_ALL=C find -E * -type f -regex '.*\.(php|php\.sample|phtml|js|css|scss|sh|xml|xml\.(dist|sample|additional|template)|xsd|csv|mxml|as)' \
-exec sed -i '' 's/2006\-2017 X/2006\-2016 X/g' {} + \
-exec sed -i '' 's/2017 Magento/2016 Magento/g' {} + \
-exec sed -i '' 's/2017 Phoenix/2016 Phoenix/g' {} +
> sed -i '' 's/2006\-2017 X/2006\-2016 X/g' mage
> git add -A .
> git commit
* Import Magento Release 1.9.3.2
This is part 2 of 2 and covers all the copyright message changes
Fingerprint of original file:
> openssl sha1 magento-1.9.3.2-2017-02-07-01-57-07.tar.bz2
SHA1(magento-1.9.3.2-2017-02-07-01-57-07.tar.bz2)= 16d15f00a1898c4706b4bcf5501d9aa360c87f5b
Commands used:
> cd magento-mirror
> rm -rf * .ht*
> tar xvf ../magento-1.9.3.2-2017-02-07-01-57-07.tar.bz2 --strip-components=1
> git add -A .
> git commit
* disable 'ALTER TABLE ... DISABLE KEYS' statements by default, and remove useless calls to useDisableKeys()
* Fixed add poll answer delete button
* [BUGFIX] Fix switching between customer addresses in the admin panel
* make sure address data is reset for each loop iteration
* stop setting empty region field to '0' when switching between saved addresses
Fixes OpenMage#193
* Fixed customer account downloadable list (OpenMage#242)
Testing github "Squash and Merge" method.
* Removed unreachable js
* Add SUPEE-4814
This fixes an infinite recursion loop when validating a "Products subselect" cart price rule.
Apparently the patch only got released for EE, but CE suffers from the same problem. :/
source: https://gist.github.com/piotrekkaminski/54529dadb0bc01a62a2d
* Updated Mage_Catalog_Model_Resource_Url
Updated Mage_Catalog_Model_Resource_Url, fixed is_active attribute when calling _getCategories()
* Import Magento Release 1.9.3.3
* Updated readme.md (OpenMage#270)
Just grammar pirate.
* This bug was present begining in 1.7.0.2 and is still present in 1.9.3.3. This patch has been running in production for about 4 years without any issues.
Code was mis-calcuating the qty of simple items to put back in stock for bundle (and configurable) products.
For example if you had a Bundle X that contained 10 Widgets and the customer ordered 10 of the Bundle X (thus they ordered 100 Widgets), the code previously would multiply twice when issuing a credit memo: When calling $item->getQty() on the Widget product Magento would return 100, since that's how many exist in the order. It would then multiply that by the number of Bundle X in the order (10), and would return 1000 items to the inventory for the Widget, instead of just 100.
* Possible fix of OpenMage#282
Possible fix of OpenMage#282
OpenMage#282
* Fix missing imagecreatefromwbmp
Fix missing imagecreatefromwbmp from https://magento.com/tech-resources/bug-tracking/issue/index/id/1504/
* Typo in Mage_Admin_Model_User
* Typo in Mage_Admin_Model_User
* Fix SKU chooser widget attributes to select which should be an array.
* Typo in category controller
* Typo in category controller
* [FIX] set email as sent only if customer notified
In all other places where a "email" flag is used, email_sent is only set if the flag is true.
PS:
In my opinion, the $notifiyCustomer condition is a better solution than assigning $notifiyCustomer directly to "email_sent". One can send invoices/creditmemos multiple times. Just a second run could make it look like an email was never sent (even though it was sent in the first run).
* Import Magento Release 1.9.3.4
* Set sane default session_cookie_lifetime (3 hours)
Refs colinmollenhour/Cm_RedisSession#104
* remove leftover 1.9.3.2 package files
* fix ssl version
./mage list-upgrades
Error:
list-upgrades: TCP connection reset by peer
remove specific ssl version, first because version specified TLS v1 is not supported by connect20.magentocommerce.com
https://www.ssllabs.com/ssltest/analyze.html?d=connect20.magentocommerce.com&s=52.3.167.65
and second because server can choise right version byself
tested on centos
PHP 5.5.38 (cli) (built: Feb 18 2017 08:04:56)
curl 7.54.1 (x86_64-redhat-linux-gnu) libcurl/7.54.1 NSS/3.28.4 zlib/1.2.7 libpsl/0.7.0 (+libicu/50.1.2) libssh2/1.8.0 nghttp2/1.21.1
* Fix slow url_rewrite query on MySQL 5.7
Fixes: OpenMage#295
* Fixes system config dependencies for multiselect fields
* Fixed undefined variable when creating shipping labels
* Adds product add to cart event
* Add possibility to remove link at sales order and account edit page
* Fixes hidden checkout config, fixes OpenMage#259
* Fixes wrong usage of getSelect()->order() method
* Use joinLeft instead of joinInner to fix customers missing from reports.
Refs OpenMage#41
Refs OpenMage#241
This commit also reverts db69295
* cloudflare reset current path in file manager
check also if is post request on set current path because i've got an issue with cloudflare that make a PURGE request like this:
[REQUEST_METHOD] => PURGE
[CONTENT_TYPE] => application/x-www-form-urlencoded; charset=UTF-8
[CONTENT_LENGTH] =>
[SCRIPT_NAME] => /index.php
[REQUEST_URI] => /index.php/gestione/cms_wysiwyg_images/contents/type/image/key/e0b288aa6c56c42688c45a7f0ef4340e/?isAjax=true
without POST parameters and reset current path on file manager to the root / and with the result of we are unable to upload or delete a file.
this resolve issues with cloudflare at application level but you can fix problem at server level by limit methods on nginix to request uri
contains *cms_wysiwyg_images*
for examples (not tested):
location ~ cms_wysiwyg_images {
limit_except POST {
deny all;
}
}
* Fixed typo, fixes OpenMage#334
* Update README.md regarding versioning strategy. Refs OpenMage#273 (OpenMage#333)
* Create .travis-ci.yml adding PHP lint
* Allow PHP 7.2 to fail for now.
* Exclude lib/PEAR and lib/phpseclib from PHP Lint test.
* Fix PHP lint path pruning.
* Actually fix PHP lint path pruning.
* Fix errors found via PHP lint.
* Speed up lint by excluding lib/Zend
* Import Magento Release 1.9.3.6
* Update patch list
* Remove rej file
* Fixed removeAccents method for german umlauts
* Fixed typo in Mage_HTTP_Client_Curl, fixes OpenMage#281
* Removed obsolete files, fixes OpenMage#352
* Make Mage registry related methods consistent
* Fix bug with missing close parenthesis
* Added missing comma, see OpenMage#317, fixes OpenMage#370
* Remove stray block element in checkout.xml- Loading branch information
Showing
184 changed files
with
13,700 additions
and
2,352 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| language: php | ||
|
|
||
| php: | ||
| - 5.6 | ||
| - 7.0 | ||
| - 7.1 | ||
| - 7.2 | ||
|
|
||
| matrix: | ||
| allow_failures: | ||
| - php: 7.2 | ||
|
|
||
| script: | ||
| - '! find . -not \( -path ./lib/PEAR -prune \) -not \( -path ./lib/phpseclib -prune \) -not \( -path ./lib/Zend -prune \) -type f -name "*.php" -exec php -d error_reporting=32767 -l {} \; 2>&1 >&- | grep "^"' | ||
| - '! find app/design -type f -name "*.phtml" -exec php -d error_reporting=32767 -l {} \; 2>&1 >&- | grep "^"' | ||
|
|
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| <?php | ||
| /** | ||
| * Magento | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
| * This source file is subject to the Open Software License (OSL 3.0) | ||
| * that is bundled with this package in the file LICENSE.txt. | ||
| * It is also available through the world-wide-web at this URL: | ||
| * http://opensource.org/licenses/osl-3.0.php | ||
| * If you did not receive a copy of the license and are unable to | ||
| * obtain it through the world-wide-web, please send an email | ||
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * DISCLAIMER | ||
| * | ||
| * Do not edit or add to this file if you wish to upgrade Magento to newer | ||
| * versions in the future. If you wish to customize Magento for your | ||
| * needs please refer to http://www.magento.com for more information. | ||
| * | ||
| * @category Mage | ||
| * @package Mage_Adminhtml | ||
| * @copyright Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com) | ||
| * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) | ||
| */ | ||
|
|
||
| /** | ||
| * Class Mage_Adminhtml_Block_Checkout_Formkey | ||
| */ | ||
| class Mage_Adminhtml_Block_Checkout_Formkey extends Mage_Adminhtml_Block_Template | ||
| { | ||
| /** | ||
| * Check form key validation on checkout. | ||
| * If disabled, show notice. | ||
| * | ||
| * @return boolean | ||
| */ | ||
| public function canShow() | ||
| { | ||
| return !Mage::getStoreConfigFlag('admin/security/validate_formkey_checkout'); | ||
| } | ||
|
|
||
| /** | ||
| * Get url for edit Advanced -> Admin section | ||
| * | ||
| * @return string | ||
| */ | ||
| public function getSecurityAdminUrl() | ||
| { | ||
| return Mage::helper("adminhtml")->getUrl('adminhtml/system_config/edit/section/admin'); | ||
| } | ||
| } |
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
36 changes: 36 additions & 0 deletions
36
app/code/core/Mage/Adminhtml/Block/Notification/Symlink.php
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <?php | ||
| /** | ||
| * Magento | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
| * This source file is subject to the Open Software License (OSL 3.0) | ||
| * that is bundled with this package in the file LICENSE.txt. | ||
| * It is also available through the world-wide-web at this URL: | ||
| * http://opensource.org/licenses/osl-3.0.php | ||
| * If you did not receive a copy of the license and are unable to | ||
| * obtain it through the world-wide-web, please send an email | ||
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * DISCLAIMER | ||
| * | ||
| * Do not edit or add to this file if you wish to upgrade Magento to newer | ||
| * versions in the future. If you wish to customize Magento for your | ||
| * needs please refer to http://www.magento.com for more information. | ||
| * | ||
| * @category Mage | ||
| * @package Mage_Adminhtml | ||
| * @copyright Copyright (c) 2006-2017 X.commerce, Inc. and affiliates (http://www.magento.com) | ||
| * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) | ||
| */ | ||
|
|
||
| class Mage_Adminhtml_Block_Notification_Symlink extends Mage_Adminhtml_Block_Template | ||
| { | ||
| /** | ||
| * @return bool | ||
| */ | ||
| public function isSymlinkEnabled() | ||
| { | ||
| return Mage::getStoreConfigFlag(self::XML_PATH_TEMPLATE_ALLOW_SYMLINK); | ||
| } | ||
| } |
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
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
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
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
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
Oops, something went wrong.