diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-09-20 22:03:42 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-09-20 22:03:42 +0200 |
| commit | 57451a2014bba889ea8fe3c8053c6442948cc728 (patch) | |
| tree | 9bb4f7a88d68f811d1949480c4819b47a2ef24af /phpBB/includes | |
| parent | 4e8e31c10b11972a073a79fbbd7865a1195ef456 (diff) | |
| parent | e38fd2b9f29b0a39e1a05139c293ce7a20447734 (diff) | |
| download | forums-57451a2014bba889ea8fe3c8053c6442948cc728.tar forums-57451a2014bba889ea8fe3c8053c6442948cc728.tar.gz forums-57451a2014bba889ea8fe3c8053c6442948cc728.tar.bz2 forums-57451a2014bba889ea8fe3c8053c6442948cc728.tar.xz forums-57451a2014bba889ea8fe3c8053c6442948cc728.zip | |
Merge remote-tracking branch 'github-cyberalien/ticket/10371' into develop
* github-cyberalien/ticket/10371:
[ticket/10371] Removing last mentions of imageset
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ab933eb523..2fa0f89436 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4559,8 +4559,6 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'T_THEME_PATH' => "{$web_path}styles/" . $user->theme['theme_path'] . '/theme', 'T_TEMPLATE_PATH' => "{$web_path}styles/" . $user->theme['template_path'] . '/template', 'T_SUPER_TEMPLATE_PATH' => (isset($user->theme['template_inherit_path']) && $user->theme['template_inherit_path']) ? "{$web_path}styles/" . $user->theme['template_inherit_path'] . '/template' : "{$web_path}styles/" . $user->theme['template_path'] . '/template', - 'T_IMAGESET_PATH' => "{$web_path}styles/" . $user->theme['imageset_path'] . '/imageset', - 'T_IMAGESET_LANG_PATH' => "{$web_path}styles/" . $user->theme['imageset_path'] . '/imageset/' . $user->lang_name, 'T_IMAGES_PATH' => "{$web_path}images/", 'T_SMILIES_PATH' => "{$web_path}{$config['smilies_path']}/", 'T_AVATAR_PATH' => "{$web_path}{$config['avatar_path']}/", @@ -4573,10 +4571,9 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'T_STYLESHEET_NAME' => $user->theme['theme_name'], 'T_THEME_NAME' => $user->theme['theme_path'], + 'T_THEME_LANG_NAME' => $user->data['user_lang'], 'T_TEMPLATE_NAME' => $user->theme['template_path'], 'T_SUPER_TEMPLATE_NAME' => (isset($user->theme['template_inherit_path']) && $user->theme['template_inherit_path']) ? $user->theme['template_inherit_path'] : $user->theme['template_path'], - 'T_IMAGESET_NAME' => $user->theme['imageset_path'], - 'T_IMAGESET_LANG_NAME' => $user->data['user_lang'], 'T_IMAGES' => 'images', 'T_SMILIES' => $config['smilies_path'], 'T_AVATAR' => $config['avatar_path'], |