<!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>[BuddyPress][7552] trunk/bp-core: Clean up admin-notice code.</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://buddypress.trac.wordpress.org/changeset/7552">7552</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2013-11-09 20:53:27 +0000 (Sat, 09 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up admin-notice code. Add `$notices` variable to `BP_Admin` class to help avoid debug notices.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcorefunctionsphp">trunk/bp-core/admin/bp-core-functions.php</a></li>
<li><a href="#trunkbpcorebpcoreadminphp">trunk/bp-core/bp-core-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-functions.php (7551 => 7552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-functions.php 2013-11-09 20:34:02 UTC (rev 7551)
+++ trunk/bp-core/admin/bp-core-functions.php 2013-11-09 20:53:27 UTC (rev 7552)
</span><span class="lines">@@ -120,27 +120,35 @@
</span><span class="cx"> * @uses bp_is_root_blog()
</span><span class="cx"> */
</span><span class="cx"> function bp_core_print_admin_notices() {
</span><del>- $bp = buddypress();
</del><span class="cx">
</span><span class="cx"> // Only the super admin should see messages
</span><del>- if ( !bp_current_user_can( 'bp_moderate' ) )
</del><ins>+ if ( ! bp_current_user_can( 'bp_moderate' ) ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><del>- // On multisite installs, don't show on the Site Admin of a non-root blog, unless
- // do_network_admin is overridden
- if ( is_multisite() && bp_core_do_network_admin() && !bp_is_root_blog() )
</del><ins>+ // On multisite installs, don't show on a non-root blog, unless
+ // 'do_network_admin' is overridden.
+ if ( is_multisite() && bp_core_do_network_admin() && ! bp_is_root_blog() ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><ins>+ // Get the admin notices
+ $admin_notices = buddypress()->admin->notices;
+
</ins><span class="cx"> // Show the messages
</span><del>- if ( !empty( $bp->admin->notices ) ) {
- ?>
</del><ins>+ if ( !empty( $admin_notices ) ) : ?>
+
</ins><span class="cx"> <div id="message" class="updated fade">
</span><del>- <?php foreach ( $bp->admin->notices as $notice ) : ?>
- <p><?php echo $notice ?></p>
- <?php endforeach ?>
</del><ins>+
+ <?php foreach ( $admin_notices as $notice ) : ?>
+
+ <p><?php echo $notice; ?></p>
+
+ <?php endforeach; ?>
+
</ins><span class="cx"> </div>
</span><del>- <?php
- }
</del><ins>+
+ <?php endif;
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'admin_notices', 'bp_core_print_admin_notices' );
</span><span class="cx"> add_action( 'network_admin_notices', 'bp_core_print_admin_notices' );
</span><span class="lines">@@ -157,14 +165,20 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $notice The notice you are adding to the queue
</span><span class="cx"> */
</span><del>-function bp_core_add_admin_notice( $notice ) {
- $bp = buddypress();
</del><ins>+function bp_core_add_admin_notice( $notice = '' ) {
</ins><span class="cx">
</span><del>- if ( empty( $bp->admin->notices ) ) {
- $bp->admin->notices = array();
</del><ins>+ // Do not add if the notice is empty
+ if ( empty( $notice ) ) {
+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $bp->admin->notices[] = $notice;
</del><ins>+ // Double check the object before referencing it
+ if ( ! isset( buddypress()->admin->notices ) ) {
+ buddypress()->admin->notices = array();
+ }
+
+ // Add the notice
+ buddypress()->admin->notices[] = $notice;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -186,12 +200,14 @@
</span><span class="cx"> $bp = buddypress();
</span><span class="cx">
</span><span class="cx"> // Only the super admin gets warnings
</span><del>- if ( !bp_current_user_can( 'bp_moderate' ) )
</del><ins>+ if ( ! bp_current_user_can( 'bp_moderate' ) ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // On multisite installs, don't load on a non-root blog, unless do_network_admin is overridden
</span><del>- if ( is_multisite() && bp_core_do_network_admin() && !bp_is_root_blog() )
</del><ins>+ if ( is_multisite() && bp_core_do_network_admin() && !bp_is_root_blog() ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Check to make sure that the blog setup routine has run. This can't happen during the
</span><span class="lines">@@ -209,8 +225,9 @@
</span><span class="cx"> /**
</span><span class="cx"> * Are pretty permalinks enabled?
</span><span class="cx"> */
</span><del>- if ( isset( $_POST['permalink_structure'] ) )
</del><ins>+ if ( isset( $_POST['permalink_structure'] ) ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if ( empty( $wp_rewrite->permalink_structure ) ) {
</span><span class="cx"> bp_core_add_admin_notice( sprintf( __( '<strong>BuddyPress is almost ready</strong>. You must <a href="%s">update your permalink structure</a> to something other than the default for it to work.', 'buddypress' ), admin_url( 'options-permalink.php' ) ) );
</span><span class="lines">@@ -247,8 +264,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // On the first admin screen after a new installation, this isn't set, so grab it to supress a misleading error message.
</span><del>- if ( empty( $bp->pages->members ) )
</del><ins>+ if ( empty( $bp->pages->members ) ) {
</ins><span class="cx"> $bp->pages = bp_core_get_directory_pages();
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> foreach( $wp_page_components as $component ) {
</span><span class="cx"> if ( !isset( $bp->pages->{$component['id']} ) ) {
</span></span></pre></div>
<a id="trunkbpcorebpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-admin.php (7551 => 7552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-admin.php 2013-11-09 20:34:02 UTC (rev 7551)
+++ trunk/bp-core/bp-core-admin.php 2013-11-09 20:53:27 UTC (rev 7552)
</span><span class="lines">@@ -60,6 +60,15 @@
</span><span class="cx"> */
</span><span class="cx"> public $js_url = '';
</span><span class="cx">
</span><ins>+ /** Other *****************************************************************/
+
+ /**
+ * Notices used for user feedback, like saving settings.
+ *
+ * @var array()
+ */
+ public $notices = array();
+
</ins><span class="cx"> /** Methods ***************************************************************/
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>