Merge pull request chriskacerguis#204 from m4ikel/patch-1

Phil Sturgeon · Phil Sturgeon · commit def12958f111 · 2013-04-29T06:48:56.000-07:00
Passing-by-reference deprecated
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
@@ -1086,7 +1086,7 @@ protected function _check_login($username = '', $password = NULL)
 			return $this->_perform_ldap_auth($username, $password);
 		}
 
-		$valid_logins = & $this->config->item('rest_valid_logins');
+		$valid_logins = $this->config->item('rest_valid_logins');
 
 		if ( ! array_key_exists($username, $valid_logins))
 		{
@@ -1181,7 +1181,7 @@ protected function _prepare_digest_auth()
 			$this->_force_login($uniqid);
 		}
 
-		$valid_logins = & $this->config->item('rest_valid_logins');
+		$valid_logins = $this->config->item('rest_valid_logins');
 		$valid_pass = $valid_logins[$digest['username']];
 
 		// This is the valid response expected

Original file line number	Diff line number	Diff line change
`@@ -1086,7 +1086,7 @@ protected function _check_login($username = '', $password = NULL)`
`1086`	`1086`	`return $this->_perform_ldap_auth($username, $password);`
`1087`	`1087`	`}`
`1088`	`1088`
`1089`		`- $valid_logins = & $this->config->item('rest_valid_logins');`
	`1089`	`+ $valid_logins = $this->config->item('rest_valid_logins');`
`1090`	`1090`
`1091`	`1091`	`if ( ! array_key_exists($username, $valid_logins))`
`1092`	`1092`	`{`
`@@ -1181,7 +1181,7 @@ protected function _prepare_digest_auth()`
`1181`	`1181`	`$this->_force_login($uniqid);`
`1182`	`1182`	`}`
`1183`	`1183`
`1184`		`- $valid_logins = & $this->config->item('rest_valid_logins');`
	`1184`	`+ $valid_logins = $this->config->item('rest_valid_logins');`
`1185`	`1185`	`$valid_pass = $valid_logins[$digest['username']];`
`1186`	`1186`
`1187`	`1187`	`// This is the valid response expected`