Fixes PHP 5.4 Strict errors

phppgadmin · Nov 4, 2012 · 9b19f9c · 9b19f9c
1 parent 5804ccf
commit 9b19f9c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/classes/database/Connection.php b/classes/database/Connection.php
@@ -20,7 +20,7 @@ class Connection {
 	 * @param $fetchMode Defaults to associative.  Override for different behaviour
 	 */
 	function Connection($host, $port, $sslmode, $user, $password, $database, $fetchMode = ADODB_FETCH_ASSOC) {
-		$this->conn = &ADONewConnection('postgres7');
+		$this->conn = ADONewConnection('postgres7');
 		$this->conn->setFetchMode($fetchMode);
 
 		// Ignore host if null

diff --git a/redirect.php b/redirect.php
@@ -10,17 +10,19 @@
 
 	// Load query vars into superglobal arrays
 	if (isset($url['urlvars'])) {
-		$vars = array();
+		$urlvars = array();
-		parse_str(value(url($url['url'], $url['urlvars']), $_REQUEST), $vars);
+
-		array_shift($vars);
+		foreach($url['urlvars'] as $k => $urlvar) {
+			$urlvars[$k] = value($urlvar, $_REQUEST);
+		}
 
 		/* parse_str function is affected by magic_quotes_gpc */
 		if (ini_get('magic_quotes_gpc')) {
-			$misc->stripVar($vars);
+			$misc->stripVar($urlvars);
 		}
 
-		$_REQUEST = array_merge($_REQUEST, $vars);
+		$_REQUEST = array_merge($_REQUEST, $urlvars);
-		$_GET = array_merge($_GET, $vars);
+		$_GET = array_merge($_GET, $urlvars);
 	}
 
 	require $url['url'];