diff --git a/GameEngine/Database.php b/GameEngine/Database.php index 45fae4fe..d02ae256 100755 --- a/GameEngine/Database.php +++ b/GameEngine/Database.php @@ -2744,7 +2744,7 @@ class MYSQLi_DB implements IDbConnection { return mysqli_query($this->dblink,$q); } - function getVillageType2($wref) { + function getVillageType2($wref, $use_cache = true) { // retirieve form cache return $this->getVillageByWorldID($wref, $use_cache)['oasistype']; } @@ -8003,7 +8003,7 @@ $q = "INSERT INTO ".TB_PREFIX."demolition VALUES ( $q = 'SELECT * FROM ' . TB_PREFIX . 'farmlist WHERE owner = '.$uid.' ORDER BY wref ASC LIMIT 1'; $result = mysqli_query($this->dblink,$q); $dbarray = mysqli_fetch_array($result); - return $dbarray['id'] > 0; + return ($dbarray['id'] ?? 0) > 0; } // no need to cache this method diff --git a/GameEngine/Units.php b/GameEngine/Units.php index ad4219c3..36f164c0 100755 --- a/GameEngine/Units.php +++ b/GameEngine/Units.php @@ -761,7 +761,7 @@ class Units { public function startRaidList($post){ global $database, $generator, $session; - $slots = $post['slot']; + $slots = $post['slot'] ?? []; if(empty($slots)){ header("Location: build.php?id=39&t=99"); exit(); diff --git a/Templates/goldClub/farmlist.tpl b/Templates/goldClub/farmlist.tpl index 49eeabfc..34ea2b1b 100644 --- a/Templates/goldClub/farmlist.tpl +++ b/Templates/goldClub/farmlist.tpl @@ -259,7 +259,7 @@ if (mysqli_num_rows($getnotice) > 0) { getVilFarmlist($session->uid)) { ?>
- +
diff --git a/Templates/goldClub/farmlist_editraid.tpl b/Templates/goldClub/farmlist_editraid.tpl index 485c2f8b..939dd1d2 100644 --- a/Templates/goldClub/farmlist_editraid.tpl +++ b/Templates/goldClub/farmlist_editraid.tpl @@ -8,7 +8,7 @@ $errormsg = $errormsg ?? null; /* ===================================================== LOAD SLOT DATA (EDIT MODE) ===================================================== */ -if ($action === 'editSlot' && $eid) { +if ($action === 'showSlot' && $eid) { $eiddata = $database->getRaidList($eid); @@ -192,7 +192,7 @@ if ( $lname = $row["name"]; $lvname = $database->getVillageField($row["wref"], 'name'); - $selected = ($lid == $lid2) ? 'selected' : ''; + $selected = ($lid == ($eiddata['lid'] ?? 0)) ? 'selected' : ''; echo '