aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xboot.php4
-rw-r--r--mod/admin.php6
2 files changed, 5 insertions, 5 deletions
diff --git a/boot.php b/boot.php
index eeddf8162..0afc976ae 100755
--- a/boot.php
+++ b/boot.php
@@ -1962,8 +1962,8 @@ function current_theme(){
if($is_mobile) {
if(isset($_SESSION['show_mobile']) && !$_SESSION['show_mobile']) {
- $system_theme = '';
- $theme_name = '';
+ $system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
+ $theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
}
else {
$system_theme = ((isset($a->config['system']['mobile_theme'])) ? $a->config['system']['mobile_theme'] : '');
diff --git a/mod/admin.php b/mod/admin.php
index df1a40019..7e8f7a301 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -365,11 +365,11 @@ function admin_page_site(&$a) {
if($files) {
foreach($files as $file) {
$f = basename($file);
- $theme_name = ((file_exists($file . '/.experimental')) ? sprintf("%s - Experimental", $f) : $f);
- if (file_exists($file . '/.mobile')) {
+ $theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - Experimental", $f) : $f);
+ if (file_exists($file . '/mobile')) {
$theme_choices_mobile[$f] = $theme_name;
}
- if (file_exists($file . '/.accessibility')) {
+ if (file_exists($file . '/accessibility')) {
$theme_choices_accessibility[$f] = $theme_name;
}
$theme_choices[$f] = $theme_name;