diff options
| author | Andrew Dolgov <[email protected]> | 2015-06-05 18:08:19 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2015-06-05 18:08:19 +0300 |
| commit | b9634eb8b8cab7329dca8d8173ce381a8c1f81f4 (patch) | |
| tree | b252d90f71a975f36fc9620d5636624de3a54fe2 /classes/pref | |
| parent | 7c0a2ab2029b98086f02da80adf6a7ebc303fd6f (diff) | |
support loading themes from themes.local
Diffstat (limited to 'classes/pref')
| -rw-r--r-- | classes/pref/prefs.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 096260bfb..bc7d9212f 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -570,8 +570,10 @@ class Pref_Prefs extends Handler_Protected { } else if ($pref_name == "USER_CSS_THEME") { - $themes = array_filter(array_map("basename", glob("themes/*.css")), - "theme_valid"); + $themes = array_merge(glob("themes/*.css"), glob("themes.local/*.css")); + $themes = array_map("basename", $themes); + $themes = array_filter($themes, "theme_valid"); + asort($themes); print_select($pref_name, $value, $themes, 'dojoType="dijit.form.Select"'); |