yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

- decoupled filter from type-classes, this is required for items.php to be

Browse Source 
groupable
- force profile.lastupdated to new Date; trial and aerror on
  raid-progress; remove 'profile=summary' from generated pages (is generated by
  jscript)
- fixed some misc errors
This commit is contained in:
Sarjuuk
2014-03-19 22:06:04 +01:00
parent d89d2c8c91
commit 1ced59c113
22 changed files with 257 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pages/objects.php
View File

@@ -24,6 +24,11 @@ if ($cat)
if (!$smarty->loadCache($cacheKey, $pageData, $filter))
{
$objectFilter = new GameObjectListFilter();
if ($_ = $objectFilter->getConditions())
$conditions[] = $_;
$objects = new GameObjectList($conditions, true);
// menuId 5: Object g_initPath()
@@ -40,9 +45,9 @@ if (!$smarty->loadCache($cacheKey, $pageData, $filter))
);
// recreate form selection
$filter = array_merge($objects->filterGetForm('form'), $filter);
$filter = array_merge($objectFilter->getForm('form'), $filter);
$filter['query'] = isset($_GET['filter']) ? $_GET['filter'] : NULL;
$filter['fi'] = $objects->filterGetForm();
$filter['fi'] = $objectFilter->getForm();
$params = [];
if ($objects->hasSetFields(['reqSkill']))
@@ -61,7 +66,7 @@ if (!$smarty->loadCache($cacheKey, $pageData, $filter))
$lv['params']['_truncated'] = 1;
}
if ($objects->filterGetError())
if ($objectFilter->error)
$lv['params']['_errors'] = '$1';
$pageData['lv'] = $lv;