mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-13 18:14:26 +02:00
Code Issues Releases Wiki Activity

Closes #4969, Fixes #5008, Fixes #4498 - FontAwesome6 support.

Browse Source
This commit is contained in:
camer0n
2023-11-17 11:18:23 -08:00
parent bf3ba04430
commit 34ba78023c
13 changed files with 216 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
e107_handlers/e_parse_class.php
View File

@@ -3973,6 +3973,7 @@ class e_parse
$cat = '';
$name = '';
list($id) = explode('.glyph', $text, 2); // trim .glyph from the end.
$origID = $id;
if (strpos($id, '-') !== false)
{
list($cat, $name) = explode('-', $id, 2);
@@ -4031,10 +4032,11 @@ class e_parse
default:
if ($this->fontawesome === 5 || $this->fontawesome === 6)
{
$fab = e107::getMedia()->getGlyphs('fab');
$fas = e107::getMedia()->getGlyphs('fas');
$far = e107::getMedia()->getGlyphs('far');
$shims = e107::getMedia()->getGlyphs('fa5-shims');
$vr = 'fa'.$this->fontawesome.'-';
$fab = e107::getMedia()->getGlyphs($vr.'fab');
$fas = e107::getMedia()->getGlyphs($vr.'fas');
$far = e107::getMedia()->getGlyphs($vr.'far');
$shims = e107::getMedia()->getGlyphs($vr.'shims');
$fa4 = e107::getMedia()->getGlyphs('fa4');
list($tmp) = explode('-', $id);
@@ -4051,7 +4053,7 @@ class e_parse
}
elseif (isset($fas[$code]))
{
$prefix = 'fas ';
$prefix = 'fas '; // 'fa-solid' for fa6?
$id = 'fa-' . $code;
}
elseif (in_array($code, $far))
@@ -4125,6 +4127,7 @@ class e_parse
{
$prefix = $glyphConfig['class'] . ' ';
$tag = $glyphConfig['tag'];
$id = $origID;
continue;
}
}