Changeset 19074

Timestamp:

10/28/2011 03:48:44 PM (13 years ago)

Author:

ryan

Message:

Avoid 'Only variables should be passed by reference' warnings. Props SergeyBiryukov. see #18975

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/includes/nav-menu.php (modified) (1 diff)
• wp-app.php (modified) (1 diff)
• wp-includes/wp-db.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -861 +861 @@
         ) );
     } else { // Update?
-        $mid = (int) array_pop( $var_by_ref = array_keys($_POST['meta']) );
+        $var_by_ref = array_keys( $_POST['meta'] );
+        $mid = (int) array_pop( $var_by_ref );
         $key = stripslashes( $_POST['meta'][$mid]['key'] );
         $value = stripslashes( $_POST['meta'][$mid]['value'] );

trunk/wp-admin/includes/nav-menu.php

@@ -338 +338 @@
                 the_post();
                 if ( 'markup' == $response_format ) {
-                    echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $var_by_ref = get_the_ID() ) ) ), 0, (object) $args );
+                    $var_by_ref = get_the_ID();
+                    echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $var_by_ref ) ) ), 0, (object) $args );
                 } elseif ( 'json' == $response_format ) {
                     echo json_encode(

trunk/wp-app.php

@@ -224 +224 @@
     function __construct() {
 
-        $this->script_name = array_pop( $var_by_ref = explode( '/', $_SERVER['SCRIPT_NAME'] ) );
+        $var_by_ref = explode( '/', $_SERVER['SCRIPT_NAME'] );
+        $this->script_name = array_pop( $var_by_ref );
         $this->app_base = site_url( $this->script_name . '/' );
 

trunk/wp-includes/wp-db.php

@@ -1387 +1387 @@
             // (Duplicates are discarded)
             foreach ( $this->last_result as $row ) {
-                $key = array_shift( $var_by_ref = get_object_vars( $row ) );
+                $var_by_ref = get_object_vars( $row );
+                $key = array_shift( $var_by_ref );
                 if ( ! isset( $new_array[ $key ] ) )
                     $new_array[ $key ] = $row;