coa/aowow
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Misc

Browse source 
- allow 0 (mis Spells) as valid pageParam
 - set lcoale before creating featuredBox on homepage (fixes links)
 - set iconStrings in DB to lowercase for Linux compatibility (thx @zackbcom)
This commit is contained in:
Sarjuuk 2014-09-08 19:31:53 +02:00
parent df3eb42ec0
commit a5ce57ddf8
4 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pages/spells.php
View file

@ -91,7 +91,7 @@ class SpellsPage extends GenericPage
parent::__construct($pageCall, $pageParam);
$this->name = Util::ucFirst(Lang::$game['spells']);
$this->subCat = $pageParam ? '='.$pageParam : '';
$this->subCat = $pageParam !== null ? '='.$pageParam : '';
$this->filter = ['classPanel' => false, 'glyphPanel' => false];
}

9
setup/updates/05_iconStringCase.sql Normal file
View file

@ -0,0 +1,9 @@
UPDATE aowow_achievement SET iconString = LOWER(iconString);
UPDATE aowow_creature SET iconString = LOWER(iconString);
UPDATE aowow_currencies SET iconString = LOWER(iconString);
UPDATE aowow_holidays SET iconString = LOWER(iconString);
UPDATE aowow_items SET iconString = LOWER(iconString);
UPDATE aowow_pet SET iconString = LOWER(iconString);
UPDATE aowow_shapeshiftforms SET iconString = LOWER(iconString);
UPDATE aowow_skillline SET iconString = LOWER(iconString);
UPDATE aowow_spell SET iconString = LOWER(iconString);

2
template/bricks/pageTemplate.tpl.php
View file

@ -16,7 +16,7 @@ if (!empty($this->gPageInfo)):
endif;
if (!empty($this->pageTemplate)):
if (User::$localeId):
if (User::$localeId && $this->pageTemplate['pageName'] != 'home'):
echo " Locale.set(".User::$localeId.");\n";
endif;

7
template/pages/home.tpl.php
View file

@ -38,7 +38,12 @@
</div>
<script type="text/javascript">//<![CDATA[
<?php echo $this->writeGlobalVars(); ?>
<?php
if (User::$localeId):
echo " Locale.set(".User::$localeId.");\n";
endif;
echo $this->writeGlobalVars();
?>
Markup.printHtml(<?php echo json_encode($this->news['text']); ?>, 'news-generic', { allow: Markup.CLASS_ADMIN });
//]]></script>
<?php endif; ?>