aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-09-20 14:16:01 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-09-20 14:16:01 +0200
commit20982df71e02e3526438368168e402eeb043d6ea (patch)
treef4529a0d9958e0db05225f1e1e1a91a3bdb16f40 /phpBB/includes/functions.php
parent26f6f6208b65b4355a40add4c86013d9a8e085dd (diff)
parentff6d590b3693c5a20f1626664bb92bb18f384d3a (diff)
downloadforums-20982df71e02e3526438368168e402eeb043d6ea.tar
forums-20982df71e02e3526438368168e402eeb043d6ea.tar.gz
forums-20982df71e02e3526438368168e402eeb043d6ea.tar.bz2
forums-20982df71e02e3526438368168e402eeb043d6ea.tar.xz
forums-20982df71e02e3526438368168e402eeb043d6ea.zip
Merge pull request #3851 from hanakin/ticket/12769
[ticket/12769] Font-Awesome Integration & Icon overhaul
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 311208baf3..58b2f0ca57 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4410,7 +4410,8 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
'T_RANKS_PATH' => "{$web_path}{$config['ranks_path']}/",
'T_UPLOAD_PATH' => "{$web_path}{$config['upload_path']}/",
'T_STYLESHEET_LINK' => "{$web_path}styles/" . rawurlencode($user->style['style_path']) . '/theme/stylesheet.css?assets_version=' . $config['assets_version'],
- 'T_STYLESHEET_LANG_LINK' => "{$web_path}styles/" . rawurlencode($user->style['style_path']) . '/theme/' . $user->lang_name . '/stylesheet.css?assets_version=' . $config['assets_version'],
+ 'T_STYLESHEET_LANG_LINK'=> "{$web_path}styles/" . rawurlencode($user->style['style_path']) . '/theme/' . $user->lang_name . '/stylesheet.css?assets_version=' . $config['assets_version'],
+ 'T_FONT_AWESOME_LINK' => !empty($config['allow_cdn']) && !empty($config['load_font_awesome_url']) ? $config['load_font_awesome_url'] : "{$web_path}assets/css/font-awesome.min.css?assets_version=" . $config['assets_version'],
'T_JQUERY_LINK' => !empty($config['allow_cdn']) && !empty($config['load_jquery_url']) ? $config['load_jquery_url'] : "{$web_path}assets/javascript/jquery.min.js?assets_version=" . $config['assets_version'],
'S_ALLOW_CDN' => !empty($config['allow_cdn']),