Theme: Fix bug in web font loader.

This commit is contained in:
reliberate 2016-05-05 20:10:19 -06:00
parent 6db45055c4
commit 7a1d650359
1 changed files with 19 additions and 15 deletions

View File

@ -28,12 +28,14 @@ header("Content-type: text/javascript; charset: UTF-8");
}
}
}
unset($fonts, $tmp_array);
unset($tmp_array);
}
}
//optimize fonts array
if (is_array($fonts) && sizeof($fonts) > 0) {
$fonts = array_unique($fonts);
$common_fonts = 'arial,arial black,arial narrow,calibri,'.
$common_fonts = 'serif,sans-serif,arial,arial black,arial narrow,calibri,'.
'candara,apple gothic,geneva,tahoma,microsoft sans serif,'.
'lucidia,lucidia console,monaco,lucidia sans unicode,'.
'lucidiagrande,consolas,menlo,trebuchet,trebuchet ms,'.
@ -41,13 +43,15 @@ header("Content-type: text/javascript; charset: UTF-8");
'impact,comic sans,comic sans ms,georgia,palatino,'.
'palatino linotype,verdana,franklin gothic,'.
'franklin gothic medium,gill sans,gill sans mt,'.
'brush script,corbel';
$common_fonts = array(explode(',', $common_fonts));
'brush script,corbel,segoe,segoe ui,optima,';
$common_fonts = explode(',', $common_fonts);
foreach ($fonts as $index => $font) {
if (in_array(strtolower($font), $common_fonts)) {
unset($fonts[$index]);
}
}
}
//load fonts
if (is_array($fonts) && sizeof($fonts) > 0) {
if ($_SESSION['theme']['font_retrieval']['text'] == 'asynchronous') {