Changeset 5048

Timestamp:

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

Author:

johnjamesjacoby

Message:

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

Location:

trunk

Files:

• bbpress.php (modified) (1 diff)
• includes/common/classes.php (modified) (4 diffs)
• includes/extend/buddypress/groups.php (modified) (5 diffs)
• includes/extend/buddypress/loader.php (modified) (6 diffs)

trunk/bbpress.php

@@ -839 +839 @@
      */
     public function setup_current_user() {
-        $this->current_user = &wp_get_current_user();
+        $this->current_user = wp_get_current_user();
     }
 

trunk/includes/common/classes.php

@@ -226 +226 @@
      * @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
@@ -233 +234 @@
      *                        title, output, post, depth and args
      */
-    public function start_el( &$output, $_post, $depth, $args ) {
-        $pad     = str_repeat( ' ', $depth * 3 );
-        $output .= '<option class="level-' . $depth . '"';
+    public function start_el( &$output, $_post, $depth = 0, $args = array(), $current_object_id = 0 ) {
+        $pad     = str_repeat( '&nbsp;', (int) $depth * 3 );
+        $output .= '<option class="level-' . (int) $depth . '"';
 
         // Disable the <option> if:
@@ -250 +251 @@
             $output .= ' disabled="disabled" value=""';
         } else {
-            $output .= ' value="' . $_post->ID .'"' . selected( $args['selected'], $_post->ID, false );
+            $output .= ' value="' . (int) $_post->ID .'"' . selected( $args['selected'], $_post->ID, false );
         }
 
@@ -262 +263 @@
 /**
  * Create hierarchical list of bbPress replies.
- * 
+ *
  * @package bbPress
  * @subpackage Classes

trunk/includes/extend/buddypress/groups.php

@@ -459 +459 @@
      * @since bbPress (r3465)
      */
-    public function create_screen() {
+    public function create_screen( $group_id = 0 ) {
 
         // Bail if not looking at this screen
@@ -465 +465 @@
             return false;
 
-        $checked = bp_get_new_group_enable_forum() || groups_get_groupmeta( bp_get_new_group_id(), 'forum_id' ); ?>
+        // Check for possibly empty group_id
+        if ( empty( $group_id ) ) {
+            $group_id = bp_get_new_group_id();
+        }
+
+        $checked = bp_get_new_group_enable_forum() || groups_get_groupmeta( $group_id, 'forum_id' ); ?>
 
         <h4><?php esc_html_e( 'Group Forum', 'bbpress' ); ?></h4>
@@ -476 +481 @@
 
         <?php
-
-        // Verify intent
-        wp_nonce_field( 'groups_create_save_' . $this->slug );
     }
 
@@ -486 +488 @@
      * @since bbPress (r3465)
      */
-    public function create_screen_save() {
+    public function create_screen_save( $group_id = 0 ) {
 
         // Nonce check
@@ -494 +496 @@
         }
 
+        // Check for possibly empty group_id
+        if ( empty( $group_id ) ) {
+            $group_id = bp_get_new_group_id();
+        }
+
         $create_forum = !empty( $_POST['bbp-create-group-forum'] ) ? true : false;
         $forum_id     = 0;
-        $forum_ids    = bbp_get_group_forum_ids( bp_get_new_group_id() );
+        $forum_ids    = bbp_get_group_forum_ids( $group_id );
 
         if ( !empty( $forum_ids ) )

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