Index: lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java,v
diff -u -r1.7.4.3 -r1.7.4.4
--- lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java	31 Jan 2007 04:03:48 -0000	1.7.4.3
+++ lams_common/src/java/org/lamsfoundation/lams/util/CSSThemeUtil.java	31 Jan 2007 04:15:07 -0000	1.7.4.4
@@ -47,8 +47,6 @@
 	 */
 	public static List<String> getAllUserThemes()
 	{
-		CSSThemeBriefDTO theme = null;
-
 		List<String> themeList = new ArrayList<String>();
 		
 		// Always have default as that defines everything. Other themes
@@ -60,7 +58,7 @@
 	   	if ( ss != null ) {
 	   		UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	   		if ( user != null ) {
-	   			theme = user.getHtmlTheme();
+	   			CSSThemeBriefDTO theme = user.getHtmlTheme();
 	   			
 	   			if (theme != null ) {
 	   				userThemeFound = true;
@@ -78,7 +76,7 @@
 	   	if ( !userThemeFound ) {
 	   		String serverDefaultTheme = Configuration.get(ConfigurationKeys.DEFAULT_HTML_THEME);
 	   		if ( serverDefaultTheme != null && ! serverDefaultTheme.equals(DEFAULT_HTML_THEME) ) {
-	   					themeList.add(theme.getName());
+	   					themeList.add(serverDefaultTheme);
 	   		}
 	   	}