Fix #131

slawkens · Jul 6, 2020 · fcff820 · fcff820
1 parent dc536f0
commit fcff820
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/system/pages/houses.php b/system/pages/houses.php
@@ -143,8 +143,20 @@
  if($type == 'guildhalls' && !$db->hasColumn('houses', 'guild'))
  $type = 'all';
 
- if(!empty($type) && $type != 'all')
- $whereby .= ' AND `guild` ' . ($type == 'guildhalls' ? '!' : '') . '= 0';
+ if (!empty($type) && $type != 'all')
+ {
+ $guildColumn = '';
+ if ($db->hasColumn('houses', 'guild')) {
+ $guildColumn = 'guild';
+ }
+ else if ($db->hasColumn('houses', 'guildid')) {
+ $guildColumn = 'guildid';
+ }
+
+ if($guildColumn !== '') {
+ $whereby .= ' AND `' . $guildColumn . '` ' . ($type == 'guildhalls' ? '!' : '') . '= 0';
+ }
+ }
 
  $houses_info = $db->query('SELECT * FROM `houses` WHERE ' . $whereby. ' ORDER BY ' . $orderby);