Changeset 15470

Timestamp:

07/25/2010 07:34:49 AM (14 years ago)

Author:

nacin

Message:

More curses on PHP 5.0.5. see #13757, fixes #14160. for 3.0.1.

Location:

branches/3.0

Files:

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

branches/3.0/wp-admin/admin-ajax.php

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

branches/3.0/wp-admin/includes/nav-menu.php

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

branches/3.0/wp-admin/ms-edit.php

@@ -105 +105 @@
             foreach ( (array)$users as $user ) {
                 $user_meta_value = unserialize( $user->meta_value );
-                if ( is_array( $user_meta_value ) && array_pop( array_keys( $user_meta_value ) ) == 'subscriber' )
+                if ( is_array( $user_meta_value ) && array_pop( $var_by_ref = array_keys( $user_meta_value ) ) == 'subscriber' )
                     $move_users[] = $user->user_id;
             }

branches/3.0/wp-app.php

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

branches/3.0/wp-includes/query.php

@@ -2739 +2739 @@
             $this->queried_object_id = $term->term_id;
         } elseif ( $this->is_posts_page ) {
-            $this->queried_object = & get_page(get_option('page_for_posts'));
+            $page_for_posts = get_option('page_for_posts');
+            $this->queried_object = & get_page( $page_for_posts );
             $this->queried_object_id = (int) $this->queried_object->ID;
         } elseif ( $this->is_single && !is_null($this->post) ) {

branches/3.0/wp-includes/wp-db.php

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