* fixed displaying houses on TFS 1.x and higher

* fixed latest migration mysql error (23)
* fixed some config warning about highscores_balance
This commit is contained in:
slawkens1 2018-01-27 12:38:50 +01:00
parent 55ab90a481
commit 57d8e0b06f
3 changed files with 4 additions and 4 deletions

View File

@ -1,7 +1,7 @@
<?php
if(!$db->hasColumn(TABLE_PREFIX . 'menu', 'blank'))
$db->query('ALTER TABLE `' . TABLE_PREFIX . 'menu` ADD `blank` TINYINT(1) NOT NULL DEFAULT 0 AFTER `link`;');
$db->query("ALTER TABLE `" . TABLE_PREFIX . "menu` ADD `blank` TINYINT(1) NOT NULL DEFAULT 0 AFTER `link`;");
if(!$db->hasColumn(TABLE_PREFIX . 'menu', 'color'))
$db->query("ALTER TABLE `' . TABLE_PREFIX . 'menu` ADD `color` CHAR(6) NOT NULL DEFAULT '' AFTER `blank`;");
$db->query("ALTER TABLE `" . TABLE_PREFIX . "menu` ADD `color` CHAR(6) NOT NULL DEFAULT '' AFTER `blank`;");

View File

@ -323,7 +323,7 @@ echo '
if($config['highscores_frags']) {
$types['frags'] = 'Frags';
}
if($config['highscores_balance'])
if(isset($config['highscores_balance']) && $config['highscores_balance'])
$types['balance'] = 'Balance';
foreach($types as $link => $name) {

View File

@ -134,7 +134,7 @@ $type = '';
echo '<br/>';
if(isset($_POST['town']) && isset($_POST['state']) && isset($_POST['order'])
&& (isset($_POST['type']) || !$db->hasTable('houses', 'guild')))
&& (isset($_POST['type']) || !$db->hasColumn('houses', 'guild')))
{
$order = $_POST['order'];
$orderby = '`name`';