Skip to content

Commit

Permalink
Merge tag 'v19.4.7' into 20.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Flyingmana committed Sep 14, 2020
2 parents 03a4798 + 18739f1 commit 7974e12
Show file tree
Hide file tree
Showing 363 changed files with 149 additions and 62,073 deletions.
18 changes: 17 additions & 1 deletion .github/changelog/version_19.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@


## v19.4.7 - unreleased
## v19.4.8 - unreleased



## v19.4.7 - 2020-09-15

#952 Remove Magento Connect, Downloader and PEAR
#1181 Updated lib Net/IDNA2 to latest version
#1185 Removed unused class Varien_Filter_Money
#1182 Mage_Eav - Fix PHP 7.4 deprecation: array/string curly braces access
#1108 Ensure correctly sorted block children after unset some of them
#969 Fix checkout address for guest order
#1170 Throw exception when editing an order and the old order could not be cancelled
#1130 Change default db name
#510 Fix _addUrlRewrite() ignoring collection store scope
#1117 Prevent duplicate entry when updating salesrule_coupon_usage
#1146 Add doc comments to image related classes
#1008 add OpenMage admin theme and theme switcher
#1012 Add development environment setup files and README

## v19.4.6 - 2020-08-18

CVE-2020-15151 Observable Timing Discrepancy - Improve validation of secret keys (#1138)
Expand Down
5 changes: 4 additions & 1 deletion .github/changelog/version_20.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@



## v20.0.3 - unreleased
## v20.0.4 - unreleased

## v20.0.3 - 2020-09-15

merged changes from v19.4.7


## v20.0.2 - 2020-08-18
Expand Down
3 changes: 1 addition & 2 deletions .phpstorm.meta.php/magento_models_methods.meta.php
Original file line number Diff line number Diff line change
Expand Up @@ -1807,7 +1807,6 @@
'install/installer_db_mysql4' => \Mage_Install_Model_Installer_Db_Mysql4::class,
'install/installer_env' => \Mage_Install_Model_Installer_Env::class,
'install/installer_filesystem' => \Mage_Install_Model_Installer_Filesystem::class,
'install/installer_pear' => \Mage_Install_Model_Installer_Pear::class,
'install/observer' => \Mage_Install_Model_Observer::class,
'install/session' => \Mage_Install_Model_Session::class,
'install/wizard' => \Mage_Install_Model_Wizard::class,
Expand Down Expand Up @@ -22274,4 +22273,4 @@
'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class,
])
);
}
}
2 changes: 1 addition & 1 deletion app/Mage.php
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public static function getOpenMageVersionInfo()
return array(
'major' => '20',
'minor' => '0',
'patch' => '2',
'patch' => '3',
'stability' => '', // beta,alpha,rc
'number' => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9
);
Expand Down
Loading

0 comments on commit 7974e12

Please sign in to comment.