Fixed wrong argument passing method in alias query functions

Marius Cramer · Marius Cramer · commit 7ae5b04f40c3 · 2013-11-29T19:51:36.000+01:00
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
@@ -264,11 +264,11 @@ public function queryOneRecord($sQuery = '') {
 	}
 
 	public function queryOne($sQuery = '') {
-		return $this->query_one($sQuery);
+		return call_user_func_array(array(&$this, 'queryOneRecord'), func_get_args());
 	}
 
 	public function query_one($sQuery = '') {
-		return $this->queryOneRecord($sQuery);
+		return call_user_func_array(array(&$this, 'queryOneRecord'), func_get_args());
 	}
 
 	/**
@@ -297,11 +297,11 @@ public function queryAllRecords($sQuery = '') {
 	}
 
 	public function queryAll($sQuery = '') {
-		return $this->queryAllRecords($sQuery);
+		return call_user_func_array(array(&$this, 'queryAllRecords'), func_get_args());
 	}
 
 	public function query_all($sQuery = '') {
-		return $this->queryAllRecords($sQuery);
+		return call_user_func_array(array(&$this, 'queryAllRecords'), func_get_args());
 	}
 
 	/**
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
@@ -269,11 +269,11 @@ public function queryOneRecord($sQuery = '') {
 	}
 
 	public function queryOne($sQuery = '') {
-		return $this->query_one($sQuery);
+		return call_user_func_array(array(&$this, 'queryOneRecord'), func_get_args());
 	}
 
 	public function query_one($sQuery = '') {
-		return $this->queryOneRecord($sQuery);
+		return call_user_func_array(array(&$this, 'queryOneRecord'), func_get_args());
 	}
 
 	/**
@@ -302,11 +302,11 @@ public function queryAllRecords($sQuery = '') {
 	}
 
 	public function queryAll($sQuery = '') {
-		return $this->queryAllRecords($sQuery);
+		return call_user_func_array(array(&$this, 'queryAllRecords'), func_get_args());
 	}
 
 	public function query_all($sQuery = '') {
-		return $this->queryAllRecords($sQuery);
+		return call_user_func_array(array(&$this, 'queryAllRecords'), func_get_args());
 	}
 
 	/**
@@ -335,7 +335,7 @@ public function queryAllArray($sQuery = '') {
 	}
 
 	public function query_all_array($sQuery = '') {
-		return $this->queryAllArray($sQuery);
+		return call_user_func_array(array(&$this, 'queryAllArray'), func_get_args());
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -264,11 +264,11 @@ public function queryOneRecord($sQuery = '') {`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`public function queryOne($sQuery = '') {`
`267`		`- return $this->query_one($sQuery);`
	`267`	`+ return call_user_func_array(array(&$this, 'queryOneRecord'), func_get_args());`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`public function query_one($sQuery = '') {`
`271`		`- return $this->queryOneRecord($sQuery);`
	`271`	`+ return call_user_func_array(array(&$this, 'queryOneRecord'), func_get_args());`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`/**`
`@@ -297,11 +297,11 @@ public function queryAllRecords($sQuery = '') {`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`public function queryAll($sQuery = '') {`
`300`		`- return $this->queryAllRecords($sQuery);`
	`300`	`+ return call_user_func_array(array(&$this, 'queryAllRecords'), func_get_args());`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`public function query_all($sQuery = '') {`
`304`		`- return $this->queryAllRecords($sQuery);`
	`304`	`+ return call_user_func_array(array(&$this, 'queryAllRecords'), func_get_args());`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -269,11 +269,11 @@ public function queryOneRecord($sQuery = '') {`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`public function queryOne($sQuery = '') {`
`272`		`- return $this->query_one($sQuery);`
	`272`	`+ return call_user_func_array(array(&$this, 'queryOneRecord'), func_get_args());`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`public function query_one($sQuery = '') {`
`276`		`- return $this->queryOneRecord($sQuery);`
	`276`	`+ return call_user_func_array(array(&$this, 'queryOneRecord'), func_get_args());`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`/**`
`@@ -302,11 +302,11 @@ public function queryAllRecords($sQuery = '') {`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`public function queryAll($sQuery = '') {`
`305`		`- return $this->queryAllRecords($sQuery);`
	`305`	`+ return call_user_func_array(array(&$this, 'queryAllRecords'), func_get_args());`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`public function query_all($sQuery = '') {`
`309`		`- return $this->queryAllRecords($sQuery);`
	`309`	`+ return call_user_func_array(array(&$this, 'queryAllRecords'), func_get_args());`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`/**`
`@@ -335,7 +335,7 @@ public function queryAllArray($sQuery = '') {`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`public function query_all_array($sQuery = '') {`
`338`		`- return $this->queryAllArray($sQuery);`
	`338`	`+ return call_user_func_array(array(&$this, 'queryAllArray'), func_get_args());`
`339`	`339`	`}`
`340`	`340`
`341`	`341`