Changeset 4597 for trunk/bp-themes/bp-default/functions.php

Timestamp:

07/04/2011 02:16:25 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Move inline global checks into bp_dtheme_show_notice()

File:

• trunk/bp-themes/bp-default/functions.php (modified) (2 diffs)

trunk/bp-themes/bp-default/functions.php

@@ -521 +521 @@
  * @since 1.2
  */
-function bp_dtheme_show_notice() { ?>
+function bp_dtheme_show_notice() {
+    global $pagenow;
+    
+    // Bail if bp-default theme was not just activated
+    if ( empty( $_GET['activated'] ) || ( 'themes.php' != $pagenow ) || !is_admin() )
+        return;
+    
+    ?>
+
     <div id="message" class="updated fade">
         <p><?php printf( __( 'Theme activated! This theme contains <a href="%s">custom header image</a> support and <a href="%s">sidebar widgets</a>.', 'buddypress' ), admin_url( 'themes.php?page=custom-header' ), admin_url( 'widgets.php' ) ) ?></p>
@@ -527 +535 @@
 
     <style type="text/css">#message2, #message0 { display: none; }</style>
+
     <?php
 }
-if ( is_admin() && isset($_GET['activated'] ) && $pagenow == "themes.php" )
-    add_action( 'admin_notices', 'bp_dtheme_show_notice' );
+add_action( 'admin_notices', 'bp_dtheme_show_notice' );
 endif;