diff --git a/includes/class.spell.php b/includes/class.spell.php index a397e22d..0c70126d 100644 --- a/includes/class.spell.php +++ b/includes/class.spell.php @@ -930,7 +930,7 @@ class SpellList extends BaseType $pos += strlen($result[0]); $resolved = $this->resolveVariableString($result, $level); - $str .= intVal($resolved) ? abs($resolved) : resolved; + $str .= intVal($resolved) ? abs($resolved) : $resolved; } $str .= substr($data, $pos); $str = str_replace('#', '$', $str); // reset marks diff --git a/includes/kernel.php b/includes/kernel.php index 92c6cfa6..4f6f06eb 100644 --- a/includes/kernel.php +++ b/includes/kernel.php @@ -49,13 +49,14 @@ class Smarty_AoWoW extends Smarty $this->assign('app_name', $config['page']['name']); $this->assign('AOWOW_REVISION', AOWOW_REVISION); $this->_tpl_vars['page'] = array( - 'reqJS' => [], // <[string]> path to required JSFile - 'reqCSS' => [], // <[string,string]> path to required CSSFile, IE condition - 'title' => null, // [string] page title - 'tab' => null, // [int] # of tab to highlight in the menu - 'type' => null, // [int] numCode for spell, npx, object, ect - 'typeId' => null, // [int] entry to display - 'path' => '[]', // [string] (js:array) path to preselect in the menu + 'reqJS' => [], // <[string]> path to required JSFile + 'reqCSS' => [], // <[string,string]> path to required CSSFile, IE condition + 'title' => null, // [string] page title + 'tab' => null, // [int] # of tab to highlight in the menu + 'type' => null, // [int] numCode for spell, npx, object, ect + 'typeId' => null, // [int] entry to display + 'path' => '[]', // [string] (js:array) path to preselect in the menu + 'gStaticUrl' => substr('http://'.$_SERVER['SERVER_NAME'].strtr($_SERVER['SCRIPT_NAME'], ['index.php' => '']), 0, -1) ); } diff --git a/includes/utilities.php b/includes/utilities.php index f5515526..19e81d51 100644 --- a/includes/utilities.php +++ b/includes/utilities.php @@ -915,10 +915,10 @@ class Util ); public static $bgImagePath = array ( - 'tiny' => 'style="background-image: url(/images/icons/tiny/%s.gif)"', - 'small' => 'style="background-image: url(/images/icons/small/%s.jpg)"', - 'medium' => 'style="background-image: url(/images/icons/medium/%s.jpg)"', - 'large' => 'style="background-image: url(/images/icons/large/%s.jpg)"', + 'tiny' => 'style="background-image: url(images/icons/tiny/%s.gif)"', + 'small' => 'style="background-image: url(images/icons/small/%s.jpg)"', + 'medium' => 'style="background-image: url(images/icons/medium/%s.jpg)"', + 'large' => 'style="background-image: url(images/icons/large/%s.jpg)"', ); private static $execTime = 0.0; diff --git a/template/head.tpl b/template/head.tpl index 312c5926..975f7ad3 100644 --- a/template/head.tpl +++ b/template/head.tpl @@ -19,7 +19,7 @@ {/foreach}