Ticket #5143: 5143-01.patch

bp-core/bp-core-widgets.php

@@ -14 +14 @@
         add_action('widgets_init', create_function('', 'return register_widget("BP_Core_Members_Widget");') );
         add_action('widgets_init', create_function('', 'return register_widget("BP_Core_Whos_Online_Widget");') );
         add_action('widgets_init', create_function('', 'return register_widget("BP_Core_Recently_Active_Widget");') );
+        // We don't want the widget if site running bp-default as it's hardcoded to sidebar
+        if( bp_is_theme_compat_active() ) {
+                add_action('widgets_init', create_function('', 'return register_widget("BP_Core_sitewide_messages_Widget");') );
+        }
 }
 add_action( 'bp_register_widgets', 'bp_core_register_widgets' );
 
@@ -287 +291 @@
         <?php
         }
 }
+/*** SITEWIDE MESSAGES WIDGET **********/
 
+class BP_CORE_sitewide_messages_Widget extends WP_Widget {
+
+        function __construct() {        
+                parent::__construct(
+                        'BP_CORE_sitewide_messages_Widget', 
+                        __('(BuddyPress) Sitewide Messages', 'buddypress'), 
+                        array( 'classname' => 'widget_bp_core_sitewide_messages buddypress widget', 'description' => __('Displays the BP admin \'all users\' sitewide messages', 'buddypress'), )
+                );
+        }
+
+        public function widget( $args, $instance ) {
+                
+                if( !is_user_logged_in() || is_super_admin() )
+                        return;
+                        
+                extract( $args );
+  
+                $title = apply_filters( 'widget_title', empty($instance['title']) ? '' : $instance['title'], $instance );
+                
+                echo $before_widget;
+                echo $before_title .
+                        $title .
+                  $after_title; 
+        
+                // output content to display ?>
+        
+                        <?php if ( bp_is_active( 'messages' )  ) : ?>
+                        
+                                <div class="bp-site-wide-message">
+                                        <?php bp_message_get_notices();  ?>
+                                </div>
+                        
+                        <?php endif; ?>
+
+        <?php
+                //end  markup output
+        
+                echo $after_widget;
+        
+        }// close function 'widget'
+        
+        public function update( $new_instance, $old_instance ) {
+                $instance = $old_instance;
+                $instance['title'] = strip_tags($new_instance['title']);
+                return $instance;
+        } 
+        public function form( $instance ) {
+                $instance = wp_parse_args( (array) $instance, array( 'title' => '') );
+                $title = strip_tags($instance['title']);
+  
+  ?>
+                <p>
+  <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?></label>
+                <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" />
+  </p>
+                <?php } 
+}
 /** Widget AJAX ******************/
 
 function bp_core_ajax_widget_members() {

bp-templates/bp-legacy/buddypress-functions.php

@@ -122 +122 @@
                 /** Notices ***********************************************************/
 
                 if ( bp_is_active( 'messages' ) ) {
-                        add_action( 'wp_footer', array( $this, 'sitewide_notices' ), 9999 );
+                        if( !is_active_widget( false, false, 'bp_core_sitewide_messages_widget', true ) ) {
+                                add_action( 'wp_footer', array( $this, 'sitewide_notices' ), 9999 );
+                        }
                 }
 
                 /** Ajax **************************************************************/