aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--admin/include/themes.class.php4
-rw-r--r--admin/themes_installed.php9
2 files changed, 12 insertions, 1 deletions
diff --git a/admin/include/themes.class.php b/admin/include/themes.class.php
index cf81fb54e..832110e8e 100644
--- a/admin/include/themes.class.php
+++ b/admin/include/themes.class.php
@@ -382,6 +382,10 @@ SELECT
{
$theme['parent'] = $val[1];
}
+ if (preg_match('/["\']activable["\'].*?(true|false)/', $theme_data, $val))
+ {
+ $theme['activable'] = get_boolean($val[1]);
+ }
// screenshot
$screenshot_path = $path.'/screenshot.png';
diff --git a/admin/themes_installed.php b/admin/themes_installed.php
index a4403266e..f98493737 100644
--- a/admin/themes_installed.php
+++ b/admin/themes_installed.php
@@ -99,7 +99,14 @@ foreach ($themes->fs_themes as $theme_id => $fs_theme)
else
{
// is the theme "activable" ?
- $fs_theme['activable'] = true;
+ if (isset($fs_theme['activable']) and !$fs_theme['activable'])
+ {
+ $fs_theme['activate_tooltip'] = l10n('This theme was not designed to be directly activated');
+ }
+ else
+ {
+ $fs_theme['activable'] = true;
+ }
$missing_parent = $themes->missing_parent_theme($theme_id);
if (isset($missing_parent))