diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-05-13 02:14:59 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-05-13 02:14:59 +0000 |
| commit | fd609f28babd75640b90a7e6fffed254ab83ad34 (patch) | |
| tree | 53002e7294df5cb7b19707f8a8127b2cb1a67544 /phpBB/includes | |
| parent | d5fc1c29f2ce7d7a310f63eaf877e0bfa42ef57c (diff) | |
| download | forums-fd609f28babd75640b90a7e6fffed254ab83ad34.tar forums-fd609f28babd75640b90a7e6fffed254ab83ad34.tar.gz forums-fd609f28babd75640b90a7e6fffed254ab83ad34.tar.bz2 forums-fd609f28babd75640b90a7e6fffed254ab83ad34.tar.xz forums-fd609f28babd75640b90a7e6fffed254ab83ad34.zip | |
- Firebird is people too
git-svn-id: file:///svn/phpbb/trunk@5907 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acm/acm_main.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/message_parser.php | 10 |
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); |