diff --git a/composer.patches.json b/composer.patches.json index b8f32a5e2911a0971ff2fc9af205fb295903ad54..a63d4ad110825aef766501d63882c1327ad05b5d 100644 --- a/composer.patches.json +++ b/composer.patches.json @@ -1,8 +1,7 @@ { "patches": { "johnpbloch/wordpress-core": { - "Patch definition of WP_CONTENT_URL to include SSL when it might not ": "patches/core/0052-fix-ssl-wp-content-url.patch", - "Disable WP 1.2 upgrade": "patches/core/wp-upgrade-110.patch", + "Patch definition of WP_CONTENT_URL to include SSL when it might not ": "patches/core/0052-fix-ssl-wp-content-url.patch", "Anonymize requests to api.wordpress.org for updates": "patches/core/anonymize-update.php.patch", "Do not perform pingbacks and trackbacks when we update via cron": "patches/core/0103-Remove-pingback-trackback.patch", "Stop Wordpress from hardcoding the location of debug.log": "patches/core/0199-patch-stops-wordpress-from-hardcoding-the-location-o.patch", diff --git a/patches/core/wp-upgrade-110.patch b/patches/core/wp-upgrade-110.patch deleted file mode 100644 index 025ac3d0b35499e8df9e79e4fdd8901323c525d7..0000000000000000000000000000000000000000 --- a/patches/core/wp-upgrade-110.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php -index 26614c9..eb5c04e 100644 ---- a/wp-admin/includes/upgrade.php -+++ b/wp-admin/includes/upgrade.php -@@ -937,6 +937,7 @@ function upgrade_101() { - * @global wpdb $wpdb WordPress database abstraction object. - */ - function upgrade_110() { -+ return; - global $wpdb; - - // Set user_nicename.