xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-06-28 00:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #466 from itrack/master

Browse Source 
Fix PHP 7.2 warning count
This commit is contained in:
Martin Ambrus
2018-01-07 13:03:37 +01:00
committed by GitHub
parent 5fa97d6be3 7b67bed84e
commit 7f4a4e4a30
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Database.php
+2 -2
View File
@@ -678,7 +678,7 @@ class MYSQLi_DB implements IDbConnection {
$arrayVariable[$arrayStructure] = [];
}
if (isset($arrayVariable[$arrayStructure]) && count($arrayVariable[$arrayStructure])) {
if (isset($arrayVariable[$arrayStructure]) && !empty($arrayVariable[$arrayStructure])) {
return $arrayVariable[$arrayStructure];
} else {
return null;
@@ -5461,7 +5461,7 @@ References: User ID/Message ID, Mode
$q = "SELECT * FROM " . TB_PREFIX . "movement, " . TB_PREFIX . "attacks where " . TB_PREFIX . "movement.`" . $where . "` IN(".implode(', ', $village).") and " . TB_PREFIX . "movement.ref = " . TB_PREFIX . "attacks.id and " . TB_PREFIX . "movement.proc = 0 and " . TB_PREFIX . "movement.sort_type = 3 or " . TB_PREFIX . "movement.`" . $where . "` IN(".implode(', ', $village).") and " . TB_PREFIX . "movement.ref = " . TB_PREFIX . "attacks.id and " . TB_PREFIX . "movement.proc = 0 and " . TB_PREFIX . "movement.sort_type = 4 ORDER BY endtime ASC";
break;
default:
return null;
return [];
}
$result = $this->mysqli_fetch_all(mysqli_query($this->dblink,$q));
GameEngine/Multisort.php
+3 -1
View File
@@ -43,8 +43,10 @@ class multiSort {
$t = 'strnatcmp($a[' . $key . '], $b[' . $key . '])';
break;
}
usort($array, create_function('$a, $b', 'return ' . ($order ? '' : '-') . '(' . $t . ');'));
usort($array, function($a, $b) use ($order, $t) {
return ($order ? '' : '-') . ($t);
});
}
return $array;
}
GameEngine/Ranking.php
+2
View File
@@ -271,6 +271,8 @@
ORDER BY totalpop DESC, totalvillages DESC, userid DESC";
}
$datas = array();
$result = (mysqli_query($GLOBALS['link'],$q));
while($row = mysqli_fetch_assoc($result)) {
$datas[] = $row;