backport

diff --git a/templates/bulletproof/config.inc.php b/templates/bulletproof/config.inc.php
index ce396b24b2f7d8bed2a36d8db4f9c918f76de722..706b2b9f637eafe88ca741ed3063f304aabea517 100644 (file)
--- a/templates/bulletproof/config.inc.php
+++ b/templates/bulletproof/config.inc.php
@@ -8,21 +8,35 @@ $probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $sere
 if (file_exists($probelang)) {\r
     include $probelang;\r
 }\r
-    \r
+\r
 include dirname(__FILE__) . '/lang_en.inc.php';\r
 \r
 $serendipity['smarty']->assign(array('currpage'=> "http://".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']));\r
 \r
+$colorsets = array(\r
+    'purple' => BP_COLORSET_OPT1,\r
+    'blue'   => BP_COLORSET_OPT2,\r
+    'green'  => BP_COLORSET_OPT3,\r
+    'blank'  => BP_COLORSET_DEF\r
+);\r
+\r
+if ($serendipity['GET']['adminModule'] == 'templates') {\r
+    $css_files = glob(dirname(__FILE__) . '/*_style.css');\r
+    foreach($css_files AS $css_file) {\r
+        $css_file = str_replace('_style.css', '', basename($css_file));\r
+        if (!isset($colorsets[$css_file])) {\r
+            $colorsets[$css_file] = $css_file;\r
+        }\r
+    }\r
+}\r
+\r
 $template_config = array(\r
     array(\r
         'var'           => 'colorset',\r
         'name'          => THEME_COLORSET,\r
         'type'          => 'select',\r
         'default'       => 'purple',\r
-        'select_values' => array('purple' => BP_COLORSET_OPT1,\r
-                                 'blue' => BP_COLORSET_OPT2,\r
-                                 'green' => BP_COLORSET_OPT3,\r
-                                 'blank' => BP_COLORSET_DEF)\r
+        'select_values' => $colorsets\r
     ),\r
     array(\r
         'var'           => 'layouttype',\r