tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-6897-estilos-rotos-metaconsola' into 'develop'

Browse Source 
Fixed broken styles in meta

See merge request artica/pandorafms!3743
This commit is contained in:
Daniel Rodriguez 2020-12-24 10:30:01 +01:00
commit aee7ec4cb2
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/general/login_page.php
View File

@ -17,7 +17,7 @@ if (isset($config['homedir'])) {
$homedir = ''; $homedir = '';
} }
ui_require_css_file('login'); ui_require_css_file('login', 'include/styles/', true);
require_once __DIR__.'/../include/functions_ui.php'; require_once __DIR__.'/../include/functions_ui.php';
require_once __DIR__.'/../include/functions.php'; require_once __DIR__.'/../include/functions.php';

15
pandora_console/include/functions_ui.php
View File

@ -1473,16 +1473,15 @@ function ui_require_css_file($name, $path='include/styles/', $echo_tag=false)
&& ! file_exists($config['homedir'].'/'.$filename) && ! file_exists($config['homedir'].'/'.$filename)
&& ! file_exists($config['homedir'].'/'.ENTERPRISE_DIR.'/'.$filename) && ! file_exists($config['homedir'].'/'.ENTERPRISE_DIR.'/'.$filename)
) { ) {
if (is_metaconsole() === true return false;
&& file_exists('/../../'.$filename) === true }
) {
$filename = '/../../'.$filename; if (is_metaconsole()) {
} else { $config['css'][$name] = '/../../'.$filename;
return false; } else {
} $config['css'][$name] = $filename;
} }
$config['css'][$name] = $filename;
return true; return true;
} }