3 files changed, 16 insertions, 3 deletions
diff --git a/phpBB/includes/acm/acm_main.php b/phpBB/includes/acm/acm_main.php
index f1aea8c115..9e1d8349c1 100644
--- a/phpBB/includes/acm/acm_main.php
+++ b/phpBB/includes/acm/acm_main.php
@@ -270,6 +270,13 @@ class cache extends acm
 						WHERE bot_active = 1
 					ORDER BY LEN(bot_agent) DESC';
 				break;
+
+				case 'firebird':
+					$sql = 'SELECT user_id, bot_agent, bot_ip 
+						FROM ' . BOTS_TABLE . '
+						WHERE bot_active = 1
+					ORDER BY STRLEN(bot_agent) DESC';
+				break;
 	
 				// LENGTH supported by MySQL, IBM DB2 and Oracle for sure...
 				default:
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index dad152ea87..9a0aa1409d 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -658,7 +658,7 @@ class acp_groups
 
 		$sql = 'SELECT g.group_id, g.group_name, g.group_type, COUNT(ug.user_id) AS total_members 
 			FROM ' . GROUPS_TABLE . ' g
-			LEFT JOIN ' . USER_GROUP_TABLE . ' ug USING (group_id)
+			LEFT JOIN ' . USER_GROUP_TABLE . ' ug ON (g.group_id = ug.group_id)
 			GROUP BY g.group_id, g.group_name, g.group_type
 			ORDER BY g.group_type ASC, g.group_name';
 		$result = $db->sql_query($sql);
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 4d940b749e..3060d76ed5 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -919,14 +919,20 @@ class parse_message extends bbcode_firstpass
 					$sql = 'SELECT * 
 						FROM ' . SMILIES_TABLE . '
 						ORDER BY LEN(code) DESC';
-					break;
+				break;
 	
+				case 'firebird':
+					$sql = 'SELECT * 
+						FROM ' . SMILIES_TABLE . '
+						ORDER BY STRLEN(code) DESC';
+				break;
+
 				// LENGTH supported by MySQL, IBM DB2, Oracle and Access for sure...
 				default:
 					$sql = 'SELECT * 
 						FROM ' . SMILIES_TABLE . '
 						ORDER BY LENGTH(code) DESC';
-					break;
+				break;
 			}
 			$result = $db->sql_query($sql, 600);