1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00

Issue #2863 Possible fix for Glyph issue (bootstrap2 icons while using bootstrap3)

This commit is contained in:
Cameron
2017-11-15 15:11:33 -08:00
parent af959b0c00
commit ab76e96e86

View File

@@ -3888,7 +3888,7 @@ class e_parser
list($cls) = explode('.glyph',$text,2); list($id) = explode('.glyph',$text,2);
// list($type, $tmp2) = explode("-",$text,2); // list($type, $tmp2) = explode("-",$text,2);
// return $cls; // return $cls;
@@ -3897,7 +3897,6 @@ class e_parser
// $id = str_replace($removePrefix, "", $cls); // $id = str_replace($removePrefix, "", $cls);
$id = $cls;
$spin = null; $spin = null;
$rotate = null; $rotate = null;
@@ -3951,8 +3950,17 @@ class e_parser
} }
elseif(strpos($text, 'icon-') === 0) // Bootstrap 2 elseif(strpos($text, 'icon-') === 0) // Bootstrap 2
{ {
$prefix = ''; if(deftrue('BOOTSTRAP') != 2) // bootrap 2 icon but running bootstrap3.
$tag = 'i'; {
$prefix = 'glyphicon ';
$tag = 'span';
$id = str_replace("icon-", "glyphicon-", $id);
}
else
{
$prefix = '';
$tag = 'i';
}
} }
elseif($custom = e107::getThemeGlyphs()) // Custom Glyphs elseif($custom = e107::getThemeGlyphs()) // Custom Glyphs