- fixed PHP warnings about class constuctors (mentioned in #4750) fixes #4752

Marius Burkard · Marius Burkard · commit cb52d1b1151e · 2017-08-06T19:18:24.000+02:00
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
@@ -1031,7 +1031,7 @@ class db_result {
 	 *
 	 * @access private
 	 */
-	public function db_result($iResId, $iConnection) {
+	public function __construct($iResId, $iConnection) {
 		$this->_iResId = $iResId;
 		$this->_iConnection = $iConnection;
 	}
@@ -1157,7 +1157,7 @@ class fakedb_result {
 	 *
 	 * @access private
 	 */
-	public function fakedb_result($aData) {
+	public function __construct($aData) {
 		$this->aResultData = $aData;
 		$this->aLimitedData = $aData;
 		reset($this->aLimitedData);
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
@@ -983,7 +983,7 @@ class db_result {
 	 *
 	 * @access private
 	 */
-	public function db_result($iResId, $iConnection) {
+	public function __construct($iResId, $iConnection) {
 		$this->_iResId = $iResId;
 		$this->_iConnection = $iConnection;
 	}
@@ -1109,7 +1109,7 @@ class fakedb_result {
 	 *
 	 * @access private
 	 */
-	public function fakedb_result($aData) {
+	public function __construct($aData) {
 		$this->aResultData = $aData;
 		$this->aLimitedData = $aData;
 		reset($this->aLimitedData);

Original file line number	Diff line number	Diff line change
`@@ -1031,7 +1031,7 @@ class db_result {`
`1031`	`1031`	`*`
`1032`	`1032`	`* @access private`
`1033`	`1033`	`*/`
`1034`		`- public function db_result($iResId, $iConnection) {`
	`1034`	`+ public function __construct($iResId, $iConnection) {`
`1035`	`1035`	`$this->_iResId = $iResId;`
`1036`	`1036`	`$this->_iConnection = $iConnection;`
`1037`	`1037`	`}`
`@@ -1157,7 +1157,7 @@ class fakedb_result {`
`1157`	`1157`	`*`
`1158`	`1158`	`* @access private`
`1159`	`1159`	`*/`
`1160`		`- public function fakedb_result($aData) {`
	`1160`	`+ public function __construct($aData) {`
`1161`	`1161`	`$this->aResultData = $aData;`
`1162`	`1162`	`$this->aLimitedData = $aData;`
`1163`	`1163`	`reset($this->aLimitedData);`
Original file line number	Diff line number	Diff line change
`@@ -983,7 +983,7 @@ class db_result {`
`983`	`983`	`*`
`984`	`984`	`* @access private`
`985`	`985`	`*/`
`986`		`- public function db_result($iResId, $iConnection) {`
	`986`	`+ public function __construct($iResId, $iConnection) {`
`987`	`987`	`$this->_iResId = $iResId;`
`988`	`988`	`$this->_iConnection = $iConnection;`
`989`	`989`	`}`
`@@ -1109,7 +1109,7 @@ class fakedb_result {`
`1109`	`1109`	`*`
`1110`	`1110`	`* @access private`
`1111`	`1111`	`*/`
`1112`		`- public function fakedb_result($aData) {`
	`1112`	`+ public function __construct($aData) {`
`1113`	`1113`	`$this->aResultData = $aData;`
`1114`	`1114`	`$this->aLimitedData = $aData;`
`1115`	`1115`	`reset($this->aLimitedData);`