Fixed token fontpath in windows. Ticket #3316.
(cherry picked from commit 2dffe9b1b8
)
This commit is contained in:
parent
b52223a7ea
commit
bed4f8e3d8
|
@ -648,13 +648,14 @@ ui_require_jquery_file ("colorpicker");
|
||||||
function load_fonts() {
|
function load_fonts() {
|
||||||
global $config;
|
global $config;
|
||||||
|
|
||||||
$dir = scandir($config['homedir'] . '/include/fonts/');
|
$home = str_replace('\\', '/', $config['homedir'] );
|
||||||
|
$dir = scandir($home. '/include/fonts/');
|
||||||
|
|
||||||
$fonts = array();
|
$fonts = array();
|
||||||
|
|
||||||
foreach ($dir as $file) {
|
foreach ($dir as $file) {
|
||||||
if (strstr($file, '.ttf') !== false) {
|
if (strstr($file, '.ttf') !== false) {
|
||||||
$fonts[$config['homedir'] . '/include/fonts/' . $file] = $file;
|
$fonts[$home . '/include/fonts/' . $file] = $file;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue