Changeset 7350

Timestamp:

08/19/2013 06:26:37 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Fix E_STRICT warnings in group creation code from using functions like array_shift() and array_pop() that expect references rather than results of array_keys(). See #5108.

Location:

trunk/bp-groups

Files:

• bp-groups-actions.php (modified) (3 diffs)
• bp-groups-template.php (modified) (6 diffs)

trunk/bp-groups/bp-groups-actions.php

@@ -43 +43 @@
 
         $reset_steps = true;
-        bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . array_shift( array_keys( $bp->groups->group_creation_steps ) ) . '/' );
+        $step        = array_keys( $bp->groups->group_creation_steps );
+        $redirect_to = bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . $step[0] . '/';
+        bp_core_redirect( $redirect_to );
     }
 
@@ -134 +136 @@
         // If we have completed all steps and hit done on the final step we
         // can redirect to the completed group
-        if ( count( $bp->groups->completed_create_steps ) == count( $bp->groups->group_creation_steps ) && bp_get_groups_current_create_step() == array_pop( array_keys( $bp->groups->group_creation_steps ) ) ) {
+        $keys = array_keys( $bp->groups->group_creation_steps );
+        if ( count( $bp->groups->completed_create_steps ) == count( $keys ) && bp_get_groups_current_create_step() == array_pop( $keys ) ) {
             unset( $bp->groups->current_create_step );
             unset( $bp->groups->completed_create_steps );
@@ -153 +156 @@
              * we need to loop the step array and fetch the next step that way.
              */
-            foreach ( (array) $bp->groups->group_creation_steps as $key => $value ) {
+            foreach ( $keys as $key ) {
                 if ( $key == bp_get_groups_current_create_step() ) {
                     $next = 1;

trunk/bp-groups/bp-groups-template.php

@@ -2205 +2205 @@
         return false;
 
-    if ( !bp_get_groups_current_create_step() )
-        $bp->groups->current_create_step = array_shift( array_keys( $bp->groups->group_creation_steps ) );
+    if ( !bp_get_groups_current_create_step() ) {
+        $keys = array_keys( $bp->groups->group_creation_steps );
+        $bp->groups->current_create_step = array_shift( $keys );
+    }
 
     $counter = 1;
@@ -2234 +2236 @@
         global $bp;
 
-        if ( !bp_action_variable( 1 ) )
-            $bp->action_variables[1] = array_shift( array_keys( $bp->groups->group_creation_steps ) );
+        if ( !bp_action_variable( 1 ) ) {
+            $keys = array_keys( $bp->groups->group_creation_steps );
+            $bp->action_variables[1] = array_shift( $keys );
+        }
 
         return apply_filters( 'bp_get_group_creation_form_action', trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/' . bp_action_variable( 1 ) ) );
@@ -2248 +2252 @@
 
     /* If this the first step, we can just accept and return true */
-    if ( !bp_action_variable( 1 ) && array_shift( array_keys( $bp->groups->group_creation_steps ) ) == $step_slug )
+    $keys = array_keys( $bp->groups->group_creation_steps );
+    if ( !bp_action_variable( 1 ) && array_shift( $keys ) == $step_slug )
         return true;
 
@@ -2290 +2295 @@
 
     /* If this is the first group creation step, return true */
-    if ( array_shift( array_keys( $bp->groups->group_creation_steps ) ) == $step_slug )
+    $keys = array_keys( $bp->groups->group_creation_steps );
+    if ( array_shift( $keys ) == $step_slug )
         return true;
 
@@ -2434 +2440 @@
     global $bp;
 
-    $last_step = array_pop( array_keys( $bp->groups->group_creation_steps ) );
+    $keys      = array_keys( $bp->groups->group_creation_steps );
+    $last_step = array_pop( $keys );
 
     if ( $last_step == bp_get_groups_current_create_step() )
@@ -2445 +2452 @@
     global $bp;
 
-    $first_step = array_shift( array_keys( $bp->groups->group_creation_steps ) );
+    $keys       = array_keys( $bp->groups->group_creation_steps );
+    $first_step = array_shift( $keys );
 
     if ( $first_step == bp_get_groups_current_create_step() )