From 722c6d7003fbedccae2b9c55dc0316be18ff059b Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Fri, 28 Oct 2011 15:48:44 +0000
Subject: [PATCH] Avoid 'Only variables should be passed by reference'
 warnings. Props SergeyBiryukov. see #18975

git-svn-id: https://develop.svn.wordpress.org/trunk@19074 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/admin-ajax.php        | 3 ++-
 wp-admin/includes/nav-menu.php | 3 ++-
 wp-app.php                     | 3 ++-
 wp-includes/wp-db.php          | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index 475b21fa32..85a686ed29 100644
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -860,7 +860,8 @@ case 'add-meta' :
 			'supplemental' => array('postid' => $pid)
 		) );
 	} 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'] );
 		if ( '' == trim($key) )
diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php
index ba78a17aed..7c3380275f 100644
--- a/wp-admin/includes/nav-menu.php
+++ b/wp-admin/includes/nav-menu.php
@@ -337,7 +337,8 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
 			while ( have_posts() ) {
 				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(
 						array(
diff --git a/wp-app.php b/wp-app.php
index 68e96d4369..323f832a8b 100644
--- a/wp-app.php
+++ b/wp-app.php
@@ -223,7 +223,8 @@ class AtomServer {
 	 */
 	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 . '/' );
 
 		$this->selectors = array(
diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 12ce58fd4d..ec2276df7a 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -1386,7 +1386,8 @@ class wpdb {
 			// Return an array of row objects with keys from column 1
 			// (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;
 			}