Merge pull request #469 from itrack/master

Fix warning row non constant key & PHP 7.2
This commit is contained in:
Martin Ambrus
2018-01-07 15:50:44 +01:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -653,7 +653,7 @@ class Message {
}
private function findSent($id) {
if (count($this->sent)) {
if (!empty($this->sent)) {
foreach ( $this->sent as $message ) {
if ( $message['id'] == $id ) {
return true;
@@ -665,7 +665,7 @@ class Message {
}
private function findArchive($id) {
if (count($this->archived)) {
if (!empty($this->archived)) {
foreach ( $this->archived as $message ) {
if ( $message['id'] == $id ) {
return true;
+1 -1
View File
@@ -26,7 +26,7 @@ if (WW == True)
$cont = 1;
while ($row = mysqli_fetch_array($result))
{
$ally = $database->getAlliance($row[alliance]);
$ally = $database->getAlliance($row['alliance']);
$query = @mysqli_query($GLOBALS['link'],'SELECT * FROM `' . TB_PREFIX . 'ww_attacks` WHERE `vid` = ' . $row['vref'] . ' ORDER BY `attack_time` ASC LIMIT 1');
$row2 = @mysqli_fetch_assoc($query);
?>