few more correction so the schema work right

This commit is contained in:
antil0pa 2018-11-30 20:03:37 +01:00
parent ef0c28f9ec
commit 93774355d2
1 changed files with 9 additions and 9 deletions

View File

@ -45,13 +45,13 @@ if($_REQUEST['schema']) {
if (($schema) && ($schema != '---')) {
// Check it exists, because this setting gets distributed to clones
if(file_exists('view/theme/redbasic/schema/' . $schema . '.php')) {
$schemefile = 'view/theme/redbasic/schema/' . $schema . '.php';
if(file_exists('extend/theme/beetroot/schema/' . $schema . '.php')) {
$schemefile = 'extend/theme/beetroot/schema/' . $schema . '.php';
require_once ($schemefile);
}
if(file_exists('view/theme/redbasic/schema/' . $schema . '.css')) {
$schemecss = file_get_contents('view/theme/redbasic/schema/' . $schema . '.css');
if(file_exists('extend/theme/beetroot/schema/' . $schema . '.css')) {
$schemecss = file_get_contents('extend/theme/beetroot/schema/' . $schema . '.css');
}
}
@ -60,13 +60,13 @@ if (($schema) && ($schema != '---')) {
// default.php and default.css MUST be symlinks to existing schema files in view/theme/redbasic/schema
if ((!$schema) || ($schema == '---')) {
if(file_exists('view/theme/redbasic/schema/default.php')) {
$schemefile = 'view/theme/redbasic/schema/default.php';
if(file_exists('extend/theme/beetroot/schema/default.php')) {
$schemefile = 'extend/theme/beetroot/schema/default.php';
require_once ($schemefile);
}
if(file_exists('view/theme/redbasic/schema/default.css')) {
$schemecss = file_get_contents('view/theme/redbasic/schema/default.css');
if(file_exists('extend/theme/beetroot/schema/default.css')) {
$schemecss = file_get_contents('extend/theme/beetroot/schema/default.css');
}
}
@ -115,7 +115,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
$x = file_get_contents('view/theme/redbasic/css/style.css');
$x .= file_get_contents('view/theme/redbasic/css/style.css');
$x .= file_get_contents('extend/theme/beetroot/css/style.css');
if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) {
$x .= file_get_contents('view/theme/redbasic/css/narrow_navbar.css');