Ticket #2371: 2731.patch

bbpress.php

@@ -838 +838 @@
          * @uses wp_get_current_user()
          */
         public function setup_current_user() {
-                $this->current_user = &wp_get_current_user();
+                $this->current_user = wp_get_current_user();
         }
 
         /** Custom Rewrite Rules **************************************************/

includes/common/classes.php

@@ -225 +225 @@
          *                    for padding.
          * @param array $args Uses 'selected' argument for selected post to set
          *                     selected HTML attribute for option element.
+         * @param int $current_object_id
          * @uses bbp_is_forum_category() To check if the forum is a category
          * @uses current_user_can() To check if the current user can post in
          *                           closed forums
@@ -232 +233 @@
          * @uses apply_filters() Calls 'bbp_walker_dropdown_post_title' with the
          *                        title, output, post, depth and args
          */
-        public function start_el( &$output, $_post, $depth, $args ) {
+        public function start_el( &$output, $_post, $depth = 0, $args = array(), $current_object_id = 0 ) {
                 $pad     = str_repeat( ' ', $depth * 3 );
                 $output .= '<option class="level-' . $depth . '"';
 
@@ -261 +262 @@
 
 /**
  * Create hierarchical list of bbPress replies.
- * 
+ *
  * @package bbPress
  * @subpackage Classes
  *

includes/extend/buddypress/groups.php

@@ -458 +458 @@
          *
          * @since bbPress (r3465)
          */
-        public function create_screen() {
+        public function create_screen( $group_id = null ) {
 
                 // Bail if not looking at this screen
                 if ( !bp_is_group_creation_step( $this->slug ) )
@@ -485 +485 @@
          *
          * @since bbPress (r3465)
          */
-        public function create_screen_save() {
+        public function create_screen_save( $group_id = null ) {
 
                 // Nonce check
                 if ( ! bbp_verify_nonce_request( 'groups_create_save_' . $this->slug ) ) {

includes/extend/buddypress/loader.php

@@ -51 +51 @@
         /**
          * Include BuddyPress classes and functions
          */
-        public function includes() {
+        public function includes( $includes = array() ) {
 
                 // Helper BuddyPress functions
                 $includes[] = 'functions.php';
@@ -80 +80 @@
          *
          * @since bbPress (r3552)
          */
-        public function setup_globals() {
+        public function setup_globals( $args = array() ) {
                 $bp = buddypress();
 
                 // Define the parent forum ID
@@ -157 +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
                 if ( !is_user_logged_in() && !bp_displayed_user_id() )
@@ -242 +242 @@
          *
          * @since bbPress (r3552)
          */
-        public function setup_admin_bar() {
+        public function setup_admin_bar( $wp_admin_nav = array() ) {
 
                 // Prevent debug notices
                 $wp_admin_nav = array();