From 7b01fb67588c0b5b42f799012986fc3176fc4e36 Mon Sep 17 00:00:00 2001
From: real_nowhereman <real_nowhereman@aa359531-4221-0410-9edc-b0b45c38dadb>
Date: Fri, 16 Nov 2007 20:56:27 +0000
Subject: [PATCH] themes and styles now sort()ed by ID

---
 admin/panels/themes/admin.themes.style.php |  5 ++--
 fp-includes/core/core.theme.php            | 27 ++++++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/admin/panels/themes/admin.themes.style.php b/admin/panels/themes/admin.themes.style.php
index 705721a..2863e99 100644
--- a/admin/panels/themes/admin.themes.style.php
+++ b/admin/panels/themes/admin.themes.style.php
@@ -25,8 +25,9 @@
 			global $fp_config;
 			
 			$o =& new admin_themes_obj_style_idx;
-			
 			$list = $o->getList();
+			sort($list);
+
 			$info = array();
 			$based = THEMES_DIR . THE_THEME;
 			
@@ -96,4 +97,4 @@
 
 	}
 	
-?>
\ No newline at end of file
+?>
diff --git a/fp-includes/core/core.theme.php b/fp-includes/core/core.theme.php
index 296cd7c..2892c9c 100644
--- a/fp-includes/core/core.theme.php
+++ b/fp-includes/core/core.theme.php
@@ -52,17 +52,36 @@
 				theme_register_default_widgetsets();
 			} else {
 				define('THEME_LEGACY_MODE', false);
+ 
+				if (isset($theme['default_style'])) {
 				
-				if ($theme['version'] > 0.704) {
 					if (!isset($fp_config['general']['style']))
-							$fp_config['general']['style'] = $theme['default_style'];
+						$fp_config['general']['style'] = $theme['default_style'];
+
+
 					include(THEMES_DIR . THE_THEME . "/{$fp_config['general']['style']}/style.conf.php");
+
 					$theme['style'] = $style; 
+
 				} else {
-					theme_register_default_widgetsets();
+					
+					
+					$theme['style'] = array(
+						
+						'style_def' 	=> $theme['style_def']? $theme['style_def'] : 'style.css',
+						'style_admin'	=> $theme['style_admin']? $theme['style_admin'] : 'style.css',
+
+					);
+
+
 				}
 				
 			}
+
+			// no widgets registered, load default set	
+			if (!get_registered_widgets())
+				theme_register_default_widgetsets();
+
 		}
 				
 		return $theme;
@@ -151,7 +170,7 @@
 		echo BLOG_BASEURL . THEMES_DIR . THE_THEME;
 		
 		
-		$css = class_exists('adminpanel')?
+		$css = defined('MOD_ADMIN_PANEL')?
 			 $theme['style']['style_admin'] : $theme['style']['style_def'];
 		
 		$substyle = '/'. (isset($fp_config['general']['style'])? $fp_config['general']['style'].'/' : '');