Changeset 5048 for trunk/includes/extend/buddypress/loader.php

Timestamp:

07/24/2013 11:39:25 AM (12 years ago)

Author:

johnjamesjacoby

Message:

PHP 5.4 compat and related sanity checks and clean-up. Props boonebgorges. Fixes #2731.

File:

• trunk/includes/extend/buddypress/loader.php (modified) (6 diffs)

trunk/includes/extend/buddypress/loader.php

@@ -52 +52 @@
      * Include BuddyPress classes and functions
      */
-    public function includes() {
+    public function includes( $includes = array() ) {
 
         // Helper BuddyPress functions
@@ -81 +81 @@
      * @since bbPress (r3552)
      */
-    public function setup_globals() {
+    public function setup_globals( $args = array() ) {
         $bp = buddypress();
 
@@ -92 +92 @@
             define( 'BP_FORUMS_SLUG', $this->id );
 
-        // All globals for messaging component.
-        $globals = array(
-            'path'                  => BP_PLUGIN_DIR,
-            'slug'                  => BP_FORUMS_SLUG,
-            'root_slug'             => isset( $bp->pages->forums->slug ) ? $bp->pages->forums->slug : BP_FORUMS_SLUG,
-            'has_directory'         => false,
-            'notification_callback' => 'messages_format_notifications',
-            'search_string'         => __( 'Search Forums...', 'bbpress' ),
-        );
-
-        parent::setup_globals( $globals );
+        // All arguments for forums component
+        $args = array(
+            'path'          => BP_PLUGIN_DIR,
+            'slug'          => BP_FORUMS_SLUG,
+            'root_slug'     => isset( $bp->pages->forums->slug ) ? $bp->pages->forums->slug : BP_FORUMS_SLUG,
+            'has_directory' => false,
+            'search_string' => __( 'Search Forums...', 'bbpress' ),
+        );
+
+        parent::setup_globals( $args );
     }
 
@@ -158 +157 @@
      * @since bbPress (r3552)
      */
-    public function setup_nav() {
+    public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
 
         // Stop if there is no user displayed or logged in
@@ -165 +164 @@
 
         // Define local variable(s)
-        $sub_nav     = array();
         $user_domain = '';
 
@@ -243 +241 @@
      * @since bbPress (r3552)
      */
-    public function setup_admin_bar() {
-
-        // Prevent debug notices
-        $wp_admin_nav = array();
+    public function setup_admin_bar( $wp_admin_nav = array() ) {
 
         // Menus for logged in user