removing smarty - part VII

- rewrote Item/Items
- BaseType: fixed querey generation wizh null-values in extraOpts
- ItemList:
  * reworked extendJsonStats() to use ?_itemstats istead of parsing on the fly
  * moved onUse-components used by xml from extendJsonStats() to separate function
  * the enhance-string passed with tooltips is now checked first
- Loot: class is no longer static
- Util::parseItemEnchantment() will now accept and return arrays and does only one single lookup
- cuFlags are explained in the infobox, when available
- JS:
  * do NOT strip iconStrings. It rightly can contain whitespaces >.<
  * removed a redundant $WH.ct in Conditions
This commit is contained in:
Sarjuuk
2014-06-28 14:29:39 +02:00
parent caa7a7e39f
commit 4919e1ef57
34 changed files with 2154 additions and 2043 deletions

View File

@@ -233,16 +233,16 @@ abstract class BaseType
$this->queryBase .= ' WHERE ('.implode($linking, $where).')';
// append grouping
if ($g = array_column($this->queryOpts, 'g'))
$this->queryBase .= ' GROUP BY '.implode(', ', array_filter($g));
if ($g = array_filter(array_column($this->queryOpts, 'g')))
$this->queryBase .= ' GROUP BY '.implode(', ', $g);
// append post filtering
if ($h = array_column($this->queryOpts, 'h'))
$this->queryBase .= ' HAVING '.implode(' AND ', array_filter($h));
if ($h = array_filter(array_column($this->queryOpts, 'h')))
$this->queryBase .= ' HAVING '.implode(' AND ', $h);
// append ordering
if ($o = array_column($this->queryOpts, 'o'))
$this->queryBase .= ' ORDER BY '.implode(', ', array_filter($o));
if ($o = array_filter(array_column($this->queryOpts, 'o')))
$this->queryBase .= ' ORDER BY '.implode(', ', $o);
// apply limit
if ($limit)