Ticket #558: ticket-558.patch

bb-admin/themes.php

@@ -10 +10 @@
 
         $activetheme = bb_get_option('bb_active_theme');
 
-        $themes = bb_get_themes();
+        $themes = array_keys(bb_get_themes());
 
         if ( !in_array($activetheme, $themes)) {
-                $activetheme = BBPATH . 'bb-templates/kakumei';
+                $activetheme = 'kakumei';
                 bb_update_option('bb_active_theme',$activetheme);
         }
+        
 ?>
 <h2><?php _e('Presentation'); ?></h2>
 
-
 <form method="post">
         <?php
         foreach ($themes as $theme) :
                 if ($theme == $activetheme) $checked = "checked='checked' "; else $checked = "";
-                $base = basename($theme);
-                echo "<p><input type='radio' name='active_theme' value ='$theme' $checked/> $base</p>";
+                echo "<p><input type='radio' id='active_theme_$theme' name='active_theme' value ='$theme' $checked/> <label for='active_theme_$theme'>$theme</label></p>";
         endforeach;
         ?>
         <p class="submit"><input type="submit" name="submit" value="Make Default"></p>

bb-includes/functions.php

@@ -1864 +1864 @@
 }
 
 function bb_get_active_theme_folder() {
-        $activetheme = bb_get_option( 'bb_active_theme' );
+        $themes = bb_get_themes();
+        $activetheme = $themes[bb_get_option( 'bb_active_theme' )];
         if ( !$activetheme )
                 $activetheme = BBPATH . 'bb-templates/kakumei';