makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16452] Rename all.min back to font-awesome.min

Browse source 
PHPBB3-16452
This commit is contained in:
rxu 2020-04-22 13:31:52 +07:00
parent 335535e73b
commit 628d39931f
No known key found for this signature in database
GPG key ID: 955F0567380E586A
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
phpBB/assets/css/all.min.css → phpBB/assets/css/font-awesome.min.css vendored
View file

2
phpBB/includes/functions.php
View file

@ -4065,7 +4065,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
'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_FONT_AWESOME_LINK' => !empty($config['allow_cdn']) && !empty($config['load_font_awesome_url']) ? $config['load_font_awesome_url'] : "{$web_path}assets/css/all.min.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_FONT_AWESOME_V4SHIMS_LINK' => "{$web_path}assets/css/phpbb-fontawesome-v4-shims.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-3.4.1.min.js?assets_version=" . $config['assets_version'],

2
phpBB/includes/functions_acp.php
View file

@ -89,7 +89,7 @@ function adm_page_header($page_title)
'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/all.min.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'] : "{$phpbb_root_path}assets/css/font-awesome.min.css?assets_version=" . $config['assets_version'],
'T_FONT_AWESOME_V4SHIMS_LINK' => "{$phpbb_root_path}assets/css/phpbb-fontawesome-v4-shims.min.css?assets_version=" . $config['assets_version'],
'T_ASSETS_VERSION' => $config['assets_version'],

2
phpBB/styles/prosilver/template/overall_footer.html
View file

@ -74,7 +74,7 @@
var $fa_cdn = $('head').find('link[rel="stylesheet"]').first(),
$span = $('<span class="fa" style="display:none"></span>').appendTo('body');
if ($span.css('fontFamily') !== 'Font Awesome 5 Free' ) {
$fa_cdn.after('<link href="{T_ASSETS_PATH}/css/all.min.css" rel="stylesheet">');
$fa_cdn.after('<link href="{T_ASSETS_PATH}/css/font-awesome.min.css" rel="stylesheet">');
$fa_cdn.remove();
}
$span.remove();

6
tests/functional/forum_style_test.php
View file

@ -19,13 +19,13 @@ class phpbb_functional_forum_style_test extends phpbb_functional_test_case
public function test_font_awesome_style()
{
$crawler = self::request('GET', 'viewtopic.php?t=1&f=2');
$this->assertContains('all.min', $crawler->filter('head > link[rel=stylesheet]')->eq(0)->attr('href'));
$this->assertContains('font-awesome.min', $crawler->filter('head > link[rel=stylesheet]')->eq(0)->attr('href'));
$crawler = self::request('GET', 'viewtopic.php?t=1');
$this->assertContains('all.min', $crawler->filter('head > link[rel=stylesheet]')->eq(0)->attr('href'));
$this->assertContains('font-awesome.min', $crawler->filter('head > link[rel=stylesheet]')->eq(0)->attr('href'));
$crawler = self::request('GET', 'viewtopic.php?t=1&view=next');
$this->assertContains('all.min', $crawler->filter('head > link[rel=stylesheet]')->eq(0)->attr('href'));
$this->assertContains('font-awesome.min', $crawler->filter('head > link[rel=stylesheet]')->eq(0)->attr('href'));
}
public function test_default_forum_style()