diff options
author | Andrew Dolgov <[email protected]> | 2010-11-17 13:39:30 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2010-11-17 13:40:38 +0300 |
commit | 8d3cb8c0a95e21bda7d4b35b41d32ea5eb4084bc (patch) | |
tree | 6c241dc9de78c98b88bb22f687024a6fb3965ff8 /functions.php | |
parent | 500943a45b3993b28ceee7331ac0bf65ae22b636 (diff) |
enable triple-pane theme; fix theme system not working
Diffstat (limited to 'functions.php')
-rw-r--r-- | functions.php | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/functions.php b/functions.php index 6d72c6873..a6977b2a2 100644 --- a/functions.php +++ b/functions.php @@ -2044,9 +2044,9 @@ } if ($theme_path) { - if (is_file("$t/theme.ini")) { - $ini = parse_ini_file("$t/theme.ini", true); - if ($ini['theme']['version'] > THEME_VERSION_REQUIRED) { + if (is_file("$theme_path/theme.ini")) { + $ini = parse_ini_file("$theme_path/theme.ini", true); + if ($ini['theme']['version'] >= THEME_VERSION_REQUIRED) { return $theme_path; } } @@ -2068,6 +2068,20 @@ return ''; } + function print_theme_includes($link) { + + $t = get_user_theme_path($link); + $time = time(); + + if ($t) { + print "<link rel=\"stylesheet\" type=\"text/css\" + href=\"$t/theme.css?$time \">"; + if (file_exists("$t/theme.js")) { + print "<script type=\"text/javascript\" src=\"$t/theme.js?$time\"> + </script>"; + } + } + } function get_all_themes() { $themes = glob("themes/*"); @@ -2079,7 +2093,7 @@ foreach ($themes as $t) { if (is_file("$t/theme.ini")) { $ini = parse_ini_file("$t/theme.ini", true); - if ($ini['theme']['version'] > THEME_VERSION_REQUIRED && + if ($ini['theme']['version'] >= THEME_VERSION_REQUIRED && !$ini['theme']['disabled']) { $entry = array(); $entry["path"] = $t; |