Ticket #13757: 13757.patch

wp-admin/admin-ajax.php

@@ -890 +890 @@
                         'supplemental' => array('postid' => $pid)
                 ) );
         } else { // Update?
-                $mid = (int) array_pop(array_keys($_POST['meta']));
+                $_POST_meta_keys = array_keys( $_POST['meta'] );
+                $mid = (int) end( $_POST_meta_keys );
                 $key = $_POST['meta'][$mid]['key'];
                 $value = $_POST['meta'][$mid]['value'];
                 if ( '' == trim($key) )

wp-admin/ms-edit.php

@@ -104 +104 @@
                         $move_users = array();
                         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' )
+                                $_user_meta_value_keys = array_keys( $user_meta_value );
+                                if ( is_array( $user_meta_value ) && end( $_user_meta_value_keys ) == 'subscriber' )
                                         $move_users[] = $user->user_id;
                         }
                         if ( false == empty( $move_users ) ) {

wp-app.php

@@ -223 +223 @@
          */
         function AtomServer() {
 
-                $this->script_name = array_pop(explode('/',$_SERVER['SCRIPT_NAME']));
+                $_SERVER_SCRIPT_NAME_array = explode( '/', $_SERVER['SCRIPT_NAME'] );
+                $this->script_name = end( $_SERVER_SCRIPT_NAME_array );
                 $this->app_base = site_url( $this->script_name . '/' );
 
                 $this->selectors = array(

wp-includes/wp-db.php

@@ -1398 +1398 @@
                         // Return an array of row objects with keys from column 1
                         // (Duplicates are discarded)
                         foreach ( $this->last_result as $row ) {
-                                $key = array_shift( get_object_vars( $row ) );
+                                $_object_vars = get_object_vars( $row );
+                                $key = reset( $_object_vars );
                                 if ( ! isset( $new_array[ $key ] ) )
                                         $new_array[ $key ] = $row;
                         }