Changeset 25307

Timestamp:

09/09/2013 06:44:25 AM (11 years ago)

Author:

dd32

Message:

Upgrader: Deprecate a few mostly unused functions, wp_update_plugin(), wp_update_theme(), and, wp_update_core().
wp_update_core() was still used, as it was never updated to make use of the newer Skins. Fixes #21874

Location:

trunk/src/wp-admin

Files:

• includes/deprecated.php (modified) (1 diff)
• includes/update-core.php (modified) (1 diff)
• includes/update.php (modified) (4 diffs)
• update-core.php (modified) (2 diffs)

trunk/src/wp-admin/includes/deprecated.php

@@ -1054 +1054 @@
     _deprecated_function( __FUNCTION__, '3.6' );    
 }
+
+/**
+ * This was once used to kick-off the Core Updater.
+ *
+ * Deprecated in favor of instantating a Core_Upgrader instance directly,
+ * and calling the 'upgrade' method.
+ *
+ * @since 2.7.0
+ * @deprecated 3.7.0
+ */
+function wp_update_core($current, $feedback = '') {
+    _deprecated_function( __FUNCTION__, '3.7', 'new Core_Upgrader();' );
+
+    if ( !empty($feedback) )
+        add_filter('update_feedback', $feedback);
+
+    include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+    $upgrader = new Core_Upgrader();
+    return $upgrader->upgrade($current);
+
+}
+
+/**
+ * This was once used to kick-off the Plugin Updater.
+ *
+ * Deprecated in favor of instantating a Plugin_Upgrader instance directly,
+ * and calling the 'upgrade' method.
+ * Unused since 2.8.0.
+ *
+ * @since 2.5.0
+ * @deprecated 3.7.0
+ */
+function wp_update_plugin($plugin, $feedback = '') {
+    _deprecated_function( __FUNCTION__, '3.7', 'new Plugin_Upgrader();' );
+
+    if ( !empty($feedback) )
+        add_filter('update_feedback', $feedback);
+
+    include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+    $upgrader = new Plugin_Upgrader();
+    return $upgrader->upgrade($plugin);
+}
+
+/**
+ * This was once used to kick-off the Plugin Updater.
+ *
+ * Deprecated in favor of instantating a Plugin_Upgrader instance directly,
+ * and calling the 'upgrade' method.
+ * Unused since 2.8.0.
+ *
+ * @since 2.7.0
+ * @deprecated 3.7.0
+ */
+function wp_update_theme($theme, $feedback = '') {
+    _deprecated_function( __FUNCTION__, '3.7', 'new Theme_Upgrader();' );
+
+    if ( !empty($feedback) )
+        add_filter('update_feedback', $feedback);
+
+    include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+    $upgrader = new Theme_Upgrader();
+    return $upgrader->upgrade($theme);
+}

trunk/src/wp-admin/includes/update-core.php

@@ -874 +874 @@
         return;
 
-    // Ensure we only run this on the update-core.php page. wp_update_core() could be called in other contexts.
+    // Ensure we only run this on the update-core.php page. The Core_Upgrader may be used in other contexts.
     if ( 'update-core.php' != $pagenow )
         return;

trunk/src/wp-admin/includes/update.php

@@ -6 +6 @@
  * @subpackage Administration
  */
-
-// The admin side of our 1.1 update system
 
 /**
@@ -221 +219 @@
 }
 
-function wp_update_plugin($plugin, $feedback = '') {
-    if ( !empty($feedback) )
-        add_filter('update_feedback', $feedback);
-
-    include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-    $upgrader = new Plugin_Upgrader();
-    return $upgrader->upgrade($plugin);
-}
-
 function get_theme_updates() {
     $themes = wp_get_themes();
@@ -244 +233 @@
 
     return $update_themes;
-}
-
-function wp_update_theme($theme, $feedback = '') {
-    if ( !empty($feedback) )
-        add_filter('update_feedback', $feedback);
-
-    include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-    $upgrader = new Theme_Upgrader();
-    return $upgrader->upgrade($theme);
 }
 
@@ -295 +275 @@
 }
 
-function wp_update_core($current, $feedback = '') {
-    if ( !empty($feedback) )
-        add_filter('update_feedback', $feedback);
-
-    include ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-    $upgrader = new Core_Upgrader();
-    return $upgrader->upgrade($current);
-
-}
-
 function maintenance_nag() {
     global $upgrading;

trunk/src/wp-admin/update-core.php

@@ -315 +315 @@
     global $wp_filesystem;
 
+    include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+
     if ( $reinstall )
         $url = 'update-core.php?action=do-core-reinstall';
@@ -348 +350 @@
         $update->response = 'reinstall';
 
-    $result = wp_update_core($update, 'show_message');
+    add_filter( 'update_feedback', 'show_message' );
+
+    $upgrader = new Core_Upgrader();
+    $result = $upgrader->upgrade( $update );
 
     if ( is_wp_error($result) ) {