<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[25307] trunk/src/wp-admin: Upgrader: Deprecate a few mostly unused functions, wp_update_plugin(), wp_update_theme(), and, wp_update_core().</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25307">25307</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2013-09-09 06:44:25 +0000 (Mon, 09 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/21874">#21874</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesdeprecatedphp">trunk/src/wp-admin/includes/deprecated.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.php</a></li>
<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/deprecated.php (25306 => 25307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/deprecated.php 2013-09-09 03:05:01 UTC (rev 25306)
+++ trunk/src/wp-admin/includes/deprecated.php 2013-09-09 06:44:25 UTC (rev 25307)
</span><span class="lines">@@ -1053,3 +1053,66 @@
</span><span class="cx"> function wp_nav_menu_locations_meta_box() {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '3.6' );
</span><span class="cx"> }
</span><ins>+
+/**
+ * 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);
+}
</ins></span></pre></div>
<a id="trunksrcwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/update-core.php (25306 => 25307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/update-core.php 2013-09-09 03:05:01 UTC (rev 25306)
+++ trunk/src/wp-admin/includes/update-core.php 2013-09-09 06:44:25 UTC (rev 25307)
</span><span class="lines">@@ -873,7 +873,7 @@
</span><span class="cx"> if ( version_compare( $wp_version, '3.4-RC1', '>=' ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // Ensure we only run this on the update-core.php page. wp_update_core() could be called in other contexts.
</del><ins>+ // Ensure we only run this on the update-core.php page. The Core_Upgrader may be used in other contexts.
</ins><span class="cx"> if ( 'update-core.php' != $pagenow )
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/update.php (25306 => 25307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/update.php 2013-09-09 03:05:01 UTC (rev 25306)
+++ trunk/src/wp-admin/includes/update.php 2013-09-09 06:44:25 UTC (rev 25307)
</span><span class="lines">@@ -6,8 +6,6 @@
</span><span class="cx"> * @subpackage Administration
</span><span class="cx"> */
</span><span class="cx">
</span><del>-// The admin side of our 1.1 update system
-
</del><span class="cx"> /**
</span><span class="cx"> * Selects the first update version from the update_core option
</span><span class="cx"> *
</span><span class="lines">@@ -220,15 +218,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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);
-}
-
</del><span class="cx"> function get_theme_updates() {
</span><span class="cx"> $themes = wp_get_themes();
</span><span class="cx"> $current = get_site_transient('update_themes');
</span><span class="lines">@@ -245,15 +234,6 @@
</span><span class="cx"> return $update_themes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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);
-}
-
</del><span class="cx"> function wp_theme_update_rows() {
</span><span class="cx"> if ( !current_user_can('update_themes' ) )
</span><span class="cx"> return;
</span><span class="lines">@@ -294,16 +274,6 @@
</span><span class="cx"> echo '</div></td></tr>';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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);
-
-}
-
</del><span class="cx"> function maintenance_nag() {
</span><span class="cx"> global $upgrading;
</span><span class="cx"> if ( ! isset( $upgrading ) )
</span></span></pre></div>
<a id="trunksrcwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/update-core.php (25306 => 25307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/update-core.php 2013-09-09 03:05:01 UTC (rev 25306)
+++ trunk/src/wp-admin/update-core.php 2013-09-09 06:44:25 UTC (rev 25307)
</span><span class="lines">@@ -314,6 +314,8 @@
</span><span class="cx"> function do_core_upgrade( $reinstall = false ) {
</span><span class="cx"> global $wp_filesystem;
</span><span class="cx">
</span><ins>+ include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+
</ins><span class="cx"> if ( $reinstall )
</span><span class="cx"> $url = 'update-core.php?action=do-core-reinstall';
</span><span class="cx"> else
</span><span class="lines">@@ -347,8 +349,11 @@
</span><span class="cx"> if ( $reinstall )
</span><span class="cx"> $update->response = 'reinstall';
</span><span class="cx">
</span><del>- $result = wp_update_core($update, 'show_message');
</del><ins>+ add_filter( 'update_feedback', 'show_message' );
</ins><span class="cx">
</span><ins>+ $upgrader = new Core_Upgrader();
+ $result = $upgrader->upgrade( $update );
+
</ins><span class="cx"> if ( is_wp_error($result) ) {
</span><span class="cx"> show_message($result);
</span><span class="cx"> if ('up_to_date' != $result->get_error_code() )
</span></span></pre>
</div>
</div>
</body>
</html>