diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-12-03 14:42:27 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-12-03 14:42:27 +0100 |
| commit | 3acee9a3eea8e3fdcef59876da273358a46903e8 (patch) | |
| tree | 3ed42316c51a61a1f40fb4a2c2f5952efc64c11d /phpBB/includes/functions_acp.php | |
| parent | 487df8befc9477c742b2794593c2ddb290c1c678 (diff) | |
| parent | 5895f56de05b637765a6583b8c51c1db3daabe91 (diff) | |
| download | forums-3acee9a3eea8e3fdcef59876da273358a46903e8.tar forums-3acee9a3eea8e3fdcef59876da273358a46903e8.tar.gz forums-3acee9a3eea8e3fdcef59876da273358a46903e8.tar.bz2 forums-3acee9a3eea8e3fdcef59876da273358a46903e8.tar.xz forums-3acee9a3eea8e3fdcef59876da273358a46903e8.zip | |
Merge pull request #4189 from marc1706/ticket/14492
[ticket/14492] Improve send stats page and include VigLink
* marc1706/ticket/14492: (47 commits)
[ticket/14492] Add user service to installer & only instantiate if needed
[ticket/14492] Fix redirection to help phpBB page
[ticket/14492] Encode URI components in systemdata for stats
[ticket/14492] Always update the time the stats were sent
[ticket/14492] Update versions in files
[ticket/14492] Add missing event variable
[ticket/14492] Don't explicitly pass data providers by refs
[ticket/14492] Update phpBB version and fix miscellaneous code issues
[ticket/14492] Install all extensions if 'all' is specified for extensions
[ticket/14492] Checkout master if viglink tag does not exist for latest version
[ticket/14492] Add language variables for updating extensions
[ticket/14492] Prevent timeouts in install & update extensions tasks
[ticket/14492] Use same list for checking if extension should be updated
[ticket/14492] Add missing config to schema_data.sql
[ticket/14492] Unify version check for installing default extensions
[ticket/14492] Use extension manager instead of finder and add try/catch
[ticket/14492] Checkout viglink for each version depending on tags
[ticket/14492] Remove unused use statement
[ticket/14492] Redirect to help phpBB page after installation
[ticket/14492] Properly retrieve version updating from
...
Diffstat (limited to 'phpBB/includes/functions_acp.php')
| -rw-r--r-- | phpBB/includes/functions_acp.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 766669480d..8bf42aa36e 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -88,6 +88,7 @@ function adm_page_header($page_title) 'T_ICONS_PATH' => "{$phpbb_root_path}{$config['icons_path']}/", 'T_RANKS_PATH' => "{$phpbb_root_path}{$config['ranks_path']}/", 'T_UPLOAD_PATH' => "{$phpbb_root_path}{$config['upload_path']}/", + 'T_FONT_AWESOME_LINK' => !empty($config['allow_cdn']) && !empty($config['load_font_awesome_url']) ? $config['load_font_awesome_url'] : "{$phpbb_root_path}assets/css/font-awesome.min.css?assets_version=" . $config['assets_version'], 'T_ASSETS_VERSION' => $config['assets_version'], |