Skip to content

Commit 7974e12

Browse files
committed
Merge tag 'v19.4.7' into 20.0
2 parents 03a4798 + 18739f1 commit 7974e12

File tree

363 files changed

+149
-62073
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

363 files changed

+149
-62073
lines changed

.github/changelog/version_19.txt

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,25 @@
11

22

3-
## v19.4.7 - unreleased
3+
## v19.4.8 - unreleased
44

55

66

7+
## v19.4.7 - 2020-09-15
8+
9+
#952 Remove Magento Connect, Downloader and PEAR
10+
#1181 Updated lib Net/IDNA2 to latest version
11+
#1185 Removed unused class Varien_Filter_Money
12+
#1182 Mage_Eav - Fix PHP 7.4 deprecation: array/string curly braces access
13+
#1108 Ensure correctly sorted block children after unset some of them
14+
#969 Fix checkout address for guest order
15+
#1170 Throw exception when editing an order and the old order could not be cancelled
16+
#1130 Change default db name
17+
#510 Fix _addUrlRewrite() ignoring collection store scope
18+
#1117 Prevent duplicate entry when updating salesrule_coupon_usage
19+
#1146 Add doc comments to image related classes
20+
#1008 add OpenMage admin theme and theme switcher
21+
#1012 Add development environment setup files and README
22+
723
## v19.4.6 - 2020-08-18
824

925
CVE-2020-15151 Observable Timing Discrepancy - Improve validation of secret keys (#1138)

.github/changelog/version_20.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11

22

33

4-
## v20.0.3 - unreleased
4+
## v20.0.4 - unreleased
55

6+
## v20.0.3 - 2020-09-15
7+
8+
merged changes from v19.4.7
69

710

811
## v20.0.2 - 2020-08-18

.phpstorm.meta.php/magento_models_methods.meta.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1807,7 +1807,6 @@
18071807
'install/installer_db_mysql4' => \Mage_Install_Model_Installer_Db_Mysql4::class,
18081808
'install/installer_env' => \Mage_Install_Model_Installer_Env::class,
18091809
'install/installer_filesystem' => \Mage_Install_Model_Installer_Filesystem::class,
1810-
'install/installer_pear' => \Mage_Install_Model_Installer_Pear::class,
18111810
'install/observer' => \Mage_Install_Model_Observer::class,
18121811
'install/session' => \Mage_Install_Model_Session::class,
18131812
'install/wizard' => \Mage_Install_Model_Wizard::class,
@@ -22274,4 +22273,4 @@
2227422273
'wishlist/wishlist' => \Mage_Wishlist_Model_Wishlist::class,
2227522274
])
2227622275
);
22277-
}
22276+
}

app/Mage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public static function getOpenMageVersionInfo()
215215
return array(
216216
'major' => '20',
217217
'minor' => '0',
218-
'patch' => '2',
218+
'patch' => '3',
219219
'stability' => '', // beta,alpha,rc
220220
'number' => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9
221221
);

0 commit comments

Comments
 (0)