removing smarty - part XII

- readded quest/quests, zones
- delayed filter-evaluation, also linked filterObj to page to be applied to cacheKey
- added check for modulo calculation with floats (fixes "0 years" - duarions)
Quests:
 * added category-locales
 * creating objectives shouldn't be quite as intensive anymore
This commit is contained in:
Sarjuuk
2014-07-03 21:49:09 +02:00
parent e0f4e9403a
commit 727d450923
25 changed files with 1735 additions and 1291 deletions

View File

@@ -668,11 +668,15 @@ abstract class Filter
$this->error = true;
}
}
$this->evaluateFilter();
}
}
// use to generate cacheKey for filterable pages
public function __sleep()
{
return ['formData'];
}
public function urlize(array $override = [], array $addCr = [])
{
$_ = [];
@@ -741,6 +745,9 @@ abstract class Filter
public function getConditions()
{
if (!$this->cndSet)
$this->evaluateFilter();
return $this->cndSet;
}
@@ -790,7 +797,7 @@ abstract class Filter
// single cnd?
if (!$qry)
$this->error = 1;
$this->error = true;
else if (count($qry) > 1)
array_unshift($qry, 'OR');
else