mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-22 05:31:58 +02:00
Code Issues Releases Wiki Activity

Closes

Browse Source
This commit is contained in:
Cameron 2021-08-13 10:58:42 -07:00
parent b994dd916d
commit f173b59672
3 changed files with 7 additions and 6 deletions
e107_handlers
theme_handler.php
e107_tests/tests/unit
e_themeTest.php
e107_themes/voux
theme.php

6
e107_handlers/theme_handler.php

@ -1180,7 +1180,7 @@ class e_theme
$ret = [];
if(preg_match('/define[ ]*?\([\'|"]BOOTSTRAP[\'|"],[ \t]*(\d)\);/', $content, $m))
if(preg_match('/define[ ]*?\([\'|"]BOOTSTRAP[\'|"],[ \t]*(\d)\);/', $content, $m) && strpos($content,'bootstrap.min.css') === false && strpos($content,'bootstrap.min.js') === false)
{
$ret[] = array('name' => 'bootstrap',
'version' => $m[1],
@ -1188,7 +1188,7 @@ class e_theme
);
}
if(preg_match('/define[ ]*?\([\'|"]FONTAWESOME[\'|"],[ \t]*(\d)\);/', $content, $m))
if(preg_match('/define[ ]*?\([\'|"]FONTAWESOME[\'|"],[ \t]*(\d)\);/', $content, $m) && strpos($content, 'font-awesome.min.css') === false)
{
$ret[] = array('name' => 'fontawesome',
'version' => $m[1],
@ -1196,6 +1196,8 @@ class e_theme
);
}
e107::getDebug()->log($ret);
return $ret;
}

3
e107_tests/tests/unit/e_themeTest.php

@ -666,6 +666,9 @@ class e_themeTest extends \Codeception\Test\Unit
);
$this->assertSame($expected, $result);
// $result = e_theme::getLegacyBSFA('basic-light');
// var_dump($result);
}

4
e107_themes/voux/theme.php

@ -21,10 +21,6 @@ define('VIEWPORT', "width=device-width, initial-scale=1.0");
// Warning: Some bootstrap CDNs are not compiled with popup.js
// use https if e107 is using https.
/*e107::js("url", "https://cdn.jsdelivr.net/bootstrap/3.3.6/js/bootstrap.min.js", 'jquery', 2);
e107::css('url', 'https://cdn.jsdelivr.net/bootstrap/3.3.6/css/bootstrap.min.css');
e107::css('url', 'https://cdn.jsdelivr.net/fontawesome/4.5.0/css/font-awesome.min.css');*/
e107::library('load', 'bootstrap');
e107::library('load', 'fontawesome');