* fixed global config variable in twig templates

* rest from account.create_character moved to twig
* fixed some grammar errors
* fixed some separators in kathrine template
This commit is contained in:
slawkens
2017-09-11 17:41:27 +02:00
parent 4685c7b868
commit 5b14c6d4d4
13 changed files with 148 additions and 109 deletions

View File

@@ -80,7 +80,8 @@ if($player->isLoaded() && !$player->isDeleted())
$account = $player->getAccount();
$rows = 0;
$outfit = $config['outfit_images_url'] . '?id=' . $player->getLookType() . (fieldExist('lookaddons', 'players') ? '&addons=' . $player->getLookAddons() : '') . '&head=' . $player->getLookHead() . '&body=' . $player->getLookBody() . '&legs=' . $player->getLookLegs() . '&feet=' . $player->getLookFeet();
if($config['characters']['outfit'])
$outfit = $config['outfit_images_url'] . '?id=' . $player->getLookType() . (fieldExist('lookaddons', 'players') ? '&addons=' . $player->getLookAddons() : '') . '&head=' . $player->getLookHead() . '&body=' . $player->getLookBody() . '&legs=' . $player->getLookLegs() . '&feet=' . $player->getLookFeet();
$flag = '';
if($config['account_country'])
@@ -396,10 +397,9 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil
}
echo $twig->render('characters.html.twig', array(
'outfit' => $outfit,
'outfit' => isset($outfit) ? $outfit : null,
'player' => $player,
'account' => $account,
'config' => $config,
'flag' => $flag,
'oldName' => $oldName,
'sex' => $player_sex,