--- mybb-122/inc/functions.php	2006-12-01 03:40:40.000000000 +0100
+++ from_mybb_123-functions.php	2006-12-07 11:01:13.000000000 +0100
@@ -6,7 +6,7 @@
  * Website: http://www.mybboard.com
  * License: http://www.mybboard.com/eula.html
  *
- * $Id: functions.php 2459 2006-11-29 09:09:55Z chris $
+ * $Id: functions.php 2475 2006-12-01 04:58:21Z Tikitiki $
  */
 
 /**
@@ -2612,27 +2612,27 @@
  */
 function build_theme_select($name, $selected="", $tid=0, $depth="", $usergroup_override=0)
 {
-	global $db, $themeselect, $tcache, $lang, $mybb;
+	global $db, $themeselect, $tcache, $lang, $mybb, $limit;
+	
 	if($tid == 0)
 	{
 		$themeselect = "<select name=\"$name\">";
 		$themeselect .= "<option value=\"0\">".$lang->use_default."</option>\n";
 		$themeselect .= "<option value=\"0\">-----------</option>\n";
+		$tid = 1;
 	}
+	
 	if(!is_array($tcache))
 	{
-		$query = $db->query("
-			SELECT name, pid, tid, allowedgroups
-			FROM ".TABLE_PREFIX."themes
-			WHERE pid != 0
-			ORDER BY pid, name
-		");
+		$query = $db->simple_select(TABLE_PREFIX."themes", "name, pid, tid, allowedgroups", "pid != '0'", array('order_by' => 'pid, name'));
+		
 		while($theme = $db->fetch_array($query))
 		{
-			$tcache[$theme['pid']][] = $theme;
+			$tcache[$theme['pid']][$theme['tid']] = $theme;
 		}
 	}
-	if(is_array($tcache))
+	
+	if(is_array($tcache[$tid]))
 	{
 		// Figure out what groups this user is in
 		if($mybb->user['additionalgroups'])
@@ -2641,9 +2641,7 @@
 		}
 		$in_groups[] = $mybb->user['usergroup'];
 
-		foreach($tcache as $misc)
-		{
-			foreach($misc as $theme)
+		foreach($tcache[$tid] as $theme)
 			{
 				$sel = "";
 				// Make theme allowed groups into array
@@ -2661,8 +2659,9 @@
 						}
 					}
 				}
+			
 				// Show theme if allowed, or if override is on
-				if($is_allowed || $theme['allowedgroups'] == "all" || $usergroup_override == 1)
+			if($is_allowed || $theme['allowedgroups'] == "all" || $theme['allowedgroups'] == "" || $usergroup_override == 1)
 				{
 					if($theme['tid'] == $selected)
 					{
@@ -2680,7 +2681,7 @@
 				}
 			}
 		}
-	}
+	
 	if(!$tid)
 	{
 		$themeselect .= "</select>";