Ticket #2789: 2789.003.patch

buddypress/bp-core/admin/bp-core-upgrade.php

@@ -1258 +1258 @@
         else
                 $status = __( 'Upgrade', 'buddypress' );
 
-        /* Add the administration tab under the "Site Admin" tab for site administrators */
+        // Add the administration tab under the "Site Admin" tab for site administrators
         bp_core_add_admin_menu_page( array(
                 'menu_title' => __( 'BuddyPress', 'buddypress' ),
                 'page_title' => __( 'BuddyPress', 'buddypress' ),
@@ -1269 +1269 @@
 
         $hook = add_submenu_page( 'bp-wizard', $status, $status, 'manage_options', 'bp-wizard', array( $bp_wizard, 'html' ) );
 
-        /* Add a hook for css/js */
+        // Add a hook for css/js
         add_action( "admin_print_styles-$hook", 'bp_core_add_admin_menu_styles' );
+
+        // Add a notice on themes page if BuddyPress setup wizard hasn't run yet
+        add_action( 'load-themes.php', 'bp_core_add_theme_notice' );
 }
 add_action( 'admin_menu', 'bp_core_add_admin_menu' );
+
+function bp_core_add_theme_notice() {
+        function bp_core_theme_message() { ?>
+                        <div id="message" class="fade error">
+                                <p style="line-height: 150%"><?php printf( __( "<strong>Do not activate a BuddyPress Theme!</strong> It looks like you haven't finished setting up BuddyPress yet.  Please run the <a href='%s'>BuddyPress setup wizard</a> now.", 'buddypress' ), admin_url( 'admin.php?page=bp-wizard' ) ) ?></p>
+                        </div>
+        <?php
+        }
+        add_action( 'admin_notices', 'bp_core_theme_message', 1 );      
+}
 
 function bp_core_add_admin_menu_styles() {
         if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )