<!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>[17032] trunk: Admin bar visibility prefs.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17032">17032</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-12-17 21:48:30 +0000 (Fri, 17 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Admin bar visibility prefs. Props duck_. see <a href="http://trac.wordpress.org/ticket/15829">#15829</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesuserphp">trunk/wp-admin/includes/user.php</a></li>
<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/user.php (17031 => 17032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/user.php 2010-12-17 20:57:03 UTC (rev 17031)
+++ trunk/wp-admin/includes/user.php 2010-12-17 21:48:30 UTC (rev 17032)
</span><span class="lines">@@ -118,6 +118,8 @@
</span><span class="cx"> if ( $update ) {
</span><span class="cx"> $user->rich_editing = isset( $_POST['rich_editing'] ) && 'false' == $_POST['rich_editing'] ? 'false' : 'true';
</span><span class="cx"> $user->admin_color = isset( $_POST['admin_color'] ) ? sanitize_text_field( $_POST['admin_color'] ) : 'fresh';
</span><ins>+ $user->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) ? 'true' : 'false';
+ $user->show_admin_bar_admin = isset( $_POST['admin_bar_admin'] ) ? 'true' : 'false';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (17031 => 17032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php 2010-12-17 20:57:03 UTC (rev 17031)
+++ trunk/wp-admin/user-edit.php 2010-12-17 21:48:30 UTC (rev 17032)
</span><span class="lines">@@ -211,10 +211,19 @@
</span><span class="cx"> <th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
</span><span class="cx"> <td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( !empty($profileuser->comment_shortcuts) ) checked('true', $profileuser->comment_shortcuts); ?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="http://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
</span><span class="cx"> </tr>
</span><del>-<?php
-endif;
-do_action('personal_options', $profileuser);
-?>
</del><ins>+<?php endif; ?>
+<tr>
+<th scope="row"><?php _e('Admin Bar')?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Admin Bar') ?></span></legend>
+<label for="admin_bar_front">
+<input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1" <?php checked( _get_admin_bar_pref( 'front', $profileuser->ID ) ); ?> />
+<?php _e( 'Display the admin bar on the front end' ); ?></label><br />
+<label for="admin_bar_admin">
+<input name="admin_bar_admin" type="checkbox" id="admin_bar_admin" value="1" <?php checked( _get_admin_bar_pref( 'admin', $profileuser->ID ) ); ?> />
+<?php _e( 'Display the admin bar in the dashboard' ); ?></label>
+</td>
+</tr>
+<?php do_action('personal_options', $profileuser); ?>
</ins><span class="cx"> </table>
</span><span class="cx"> <?php
</span><span class="cx"> if ( IS_PROFILE_PAGE )
</span></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (17031 => 17032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2010-12-17 20:57:03 UTC (rev 17031)
+++ trunk/wp-includes/admin-bar.php 2010-12-17 21:48:30 UTC (rev 17032)
</span><span class="lines">@@ -300,6 +300,26 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Set the display status of the admin bar
+ *
+ * This can be called immediately upon plugin load. It does not need to be called from a function hooked to the init action.
+ *
+ * @since 3.1.0
+ *
+ * @param bool $show Whether to allow the admin bar to show.
+ * @return void
+ */
+function show_admin_bar( $show ) {
+ global $show_admin_bar;
+ $show_admin_bar = (bool) $show;
+
+ // Remove the object if we are not going to be showing
+ // Otherwise you have to call this function prior to the init hook for it to work!
+ if ( ! $show_admin_bar && isset( $GLOBALS['wp_admin_bar'] ) )
+ $GLOBALS['wp_admin_bar'] = null;
+}
+
+/**
</ins><span class="cx"> * Determine whether the admin bar should be showing.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="lines">@@ -314,10 +334,11 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( ! isset( $show_admin_bar ) ) {
</span><del>- if ( ! is_user_logged_in() || ( is_admin() && ! is_multisite() ) ) {
</del><ins>+ if ( ! is_user_logged_in() ) {
</ins><span class="cx"> $show_admin_bar = false;
</span><span class="cx"> } else {
</span><del>- $show_admin_bar = true;
</del><ins>+ $context = is_admin() ? 'admin' : 'front';
+ $show_admin_bar = _get_admin_bar_pref( $context );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -325,4 +346,22 @@
</span><span class="cx">
</span><span class="cx"> return $show_admin_bar;
</span><span class="cx"> }
</span><ins>+
+/**
+ * Retrieve the admin bar display preference of a user based on context.
+ *
+ * @since 3.1.0
+ * @access private
+ *
+ * @param string $context Context of this preference check, either 'admin' or 'front'
+ * @param int $user Optional. ID of the user to check, defaults to 0 for current user
+ * @return bool Whether the admin bar should be showing for this user
+ */
+function _get_admin_bar_pref( $context, $user = 0 ) {
+ $pref = get_user_option( "show_admin_bar_{$context}", $user );
+ if ( false === $pref )
+ return 'admin' != $context || is_multisite();
+
+ return 'true' === $pref;
+}
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (17031 => 17032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-12-17 20:57:03 UTC (rev 17031)
+++ trunk/wp-includes/functions.php 2010-12-17 21:48:30 UTC (rev 17032)
</span><span class="lines">@@ -4471,24 +4471,4 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
- * Set the display status of the admin bar
- *
- * This can be called immediately upon plugin load. It does not need to be called from a function hooked to the init action.
- *
- * @since 3.1.0
- *
- * @param bool $show Whether to allow the admin bar to show.
- * @return void
- */
-function show_admin_bar( $show ) {
- global $show_admin_bar;
- $show_admin_bar = (bool) $show;
-
- // Remove the object if we are not going to be showing
- // Otherwise you have to call this function prior to the init hook for it to work!
- if ( ! $show_admin_bar && isset( $GLOBALS['wp_admin_bar'] ) )
- $GLOBALS['wp_admin_bar'] = null;
-}
-
-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (17031 => 17032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-12-17 20:57:03 UTC (rev 17031)
+++ trunk/wp-includes/user.php 2010-12-17 21:48:30 UTC (rev 17032)
</span><span class="lines">@@ -507,8 +507,7 @@
</span><span class="cx"> if ( !empty( $qv['include'] ) ) {
</span><span class="cx"> $ids = implode( ',', wp_parse_id_list( $qv['include'] ) );
</span><span class="cx"> $this->query_where .= " AND $wpdb->users.ID IN ($ids)";
</span><del>- }
- elseif ( !empty($qv['exclude']) ) {
</del><ins>+ } elseif ( !empty($qv['exclude']) ) {
</ins><span class="cx"> $ids = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
</span><span class="cx"> $this->query_where .= " AND $wpdb->users.ID NOT IN ($ids)";
</span><span class="cx"> }
</span><span class="lines">@@ -1446,6 +1445,12 @@
</span><span class="cx">
</span><span class="cx"> if ( empty($user_registered) )
</span><span class="cx"> $user_registered = gmdate('Y-m-d H:i:s');
</span><ins>+
+ if ( empty($show_admin_bar_front) )
+ $show_admin_bar_front = 'true';
+
+ if ( empty($show_admin_bar_admin) )
+ $show_admin_bar_admin = is_multisite() ? 'true' : 'false';
</ins><span class="cx">
</span><span class="cx"> $user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $user_nicename, $user_login));
</span><span class="cx">
</span><span class="lines">@@ -1470,14 +1475,16 @@
</span><span class="cx"> $user_id = (int) $wpdb->insert_id;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- update_user_meta( $user_id, 'first_name', $first_name);
- update_user_meta( $user_id, 'last_name', $last_name);
</del><ins>+ update_user_meta( $user_id, 'first_name', $first_name );
+ update_user_meta( $user_id, 'last_name', $last_name );
</ins><span class="cx"> update_user_meta( $user_id, 'nickname', $nickname );
</span><span class="cx"> update_user_meta( $user_id, 'description', $description );
</span><del>- update_user_meta( $user_id, 'rich_editing', $rich_editing);
- update_user_meta( $user_id, 'comment_shortcuts', $comment_shortcuts);
- update_user_meta( $user_id, 'admin_color', $admin_color);
- update_user_meta( $user_id, 'use_ssl', $use_ssl);
</del><ins>+ update_user_meta( $user_id, 'rich_editing', $rich_editing );
+ update_user_meta( $user_id, 'comment_shortcuts', $comment_shortcuts );
+ update_user_meta( $user_id, 'admin_color', $admin_color );
+ update_user_meta( $user_id, 'use_ssl', $use_ssl );
+ update_user_meta( $user_id, 'show_admin_bar_front', $show_admin_bar_front );
+ update_user_meta( $user_id, 'show_admin_bar_admin', $show_admin_bar_admin );
</ins><span class="cx">
</span><span class="cx"> $user = new WP_User($user_id);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>