<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[17048] trunk/wp-admin: Use the update_core,
update_plugins and update_themes caps in update-core.php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17048">17048</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-12-18 18:43:35 +0000 (Sat, 18 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use the update_core, update_plugins and update_themes caps in update-core.php. fixes <a href="http://trac.wordpress.org/ticket/15866">#15866</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminnetworkmenuphp">trunk/wp-admin/network/menu.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (17047 => 17048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-12-18 18:37:11 UTC (rev 17047)
+++ trunk/wp-admin/menu.php 2010-12-18 18:43:35 UTC (rev 17048)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> $update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
</span><span class="cx">
</span><del>- $submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'install_plugins', 'update-core.php');
</del><ins>+ $submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'update_core', 'update-core.php');
</ins><span class="cx"> unset($plugin_update_count, $theme_update_count, $wordpress_update_count, $update_count, $update_title, $update_themes, $update_plugins, $update_wordpress);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworkmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/menu.php (17047 => 17048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/menu.php 2010-12-18 18:37:11 UTC (rev 17047)
+++ trunk/wp-admin/network/menu.php 2010-12-18 18:43:35 UTC (rev 17048)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> $update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
</span><span class="cx">
</span><span class="cx"> $menu[30] = array(sprintf( __('Updates %s'), "<span class='update-plugins count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'div');
</span><del>-$submenu[ 'upgrade.php' ][10] = array( __( 'Updates' ), 'install_plugins', 'update-core.php' );
</del><ins>+$submenu[ 'upgrade.php' ][10] = array( __( 'Updates' ), 'update_core', 'update-core.php' );
</ins><span class="cx"> $submenu[ 'upgrade.php' ][15] = array( __( 'Update Network' ), 'manage_network', 'upgrade.php' );
</span><span class="cx"> unset($plugin_update_count, $theme_update_count, $wordpress_update_count, $update_count, $update_title, $update_themes, $update_plugins, $update_wordpress);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (17047 => 17048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2010-12-18 18:37:11 UTC (rev 17047)
+++ trunk/wp-admin/update-core.php 2010-12-18 18:43:35 UTC (rev 17048)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> exit();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( ! current_user_can( 'update_plugins' ) )
</del><ins>+if ( ! current_user_can( 'update_core' ) )
</ins><span class="cx"> wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
</span><span class="cx">
</span><span class="cx"> function list_core_update( $update ) {
</span><span class="lines">@@ -164,8 +164,10 @@
</span><span class="cx"> echo '<p>' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, your site will return to normal.' ) . '</p>';
</span><span class="cx"> dismissed_updates();
</span><span class="cx">
</span><del>- list_plugin_updates();
- list_theme_updates();
</del><ins>+ if ( current_user_can( 'update_plugins' ) )
+ list_plugin_updates();
+ if ( current_user_can( 'update_themes' ) )
+ list_theme_updates();
</ins><span class="cx"> do_action('core_upgrade_preamble');
</span><span class="cx"> echo '</div>';
</span><span class="cx"> }
</span><span class="lines">@@ -406,9 +408,11 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( 'upgrade-core' == $action ) {
</span><ins>+
</ins><span class="cx"> wp_version_check();
</span><span class="cx"> require_once(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx"> core_upgrade_preamble();
</span><ins>+
</ins><span class="cx"> } elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) {
</span><span class="cx"> check_admin_referer('upgrade-core');
</span><span class="cx">
</span><span class="lines">@@ -429,6 +433,10 @@
</span><span class="cx"> do_core_upgrade($reinstall);
</span><span class="cx">
</span><span class="cx"> } elseif ( 'do-plugin-upgrade' == $action ) {
</span><ins>+
+ if ( ! current_user_can( 'update_plugins' ) )
+ wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+
</ins><span class="cx"> check_admin_referer('upgrade-core');
</span><span class="cx">
</span><span class="cx"> if ( isset( $_GET['plugins'] ) ) {
</span><span class="lines">@@ -451,7 +459,12 @@
</span><span class="cx"> echo '<h2>' . esc_html__('Update Plugins') . '</h2>';
</span><span class="cx"> echo "<iframe src='$url' style='width: 100%; height: 100%; min-height: 750px;' frameborder='0'></iframe>";
</span><span class="cx"> echo '</div>';
</span><ins>+
</ins><span class="cx"> } elseif ( 'do-theme-upgrade' == $action ) {
</span><ins>+
+ if ( ! current_user_can( 'update_themes' ) )
+ wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+
</ins><span class="cx"> check_admin_referer('upgrade-core');
</span><span class="cx">
</span><span class="cx"> if ( isset( $_GET['themes'] ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>