diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-05-15 20:17:35 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-05-15 20:17:35 +0000 |
| commit | 918914926b13253ef3a9af40bcdb0ea8b900f497 (patch) | |
| tree | 2d1e0313e99f45e82a2f5081dfb450de352dad28 /phpBB/adm/admin_bbcodes.php | |
| parent | 4c207e5510a77931d3eed6fc065f294c8f675f82 (diff) | |
| download | forums-918914926b13253ef3a9af40bcdb0ea8b900f497.tar forums-918914926b13253ef3a9af40bcdb0ea8b900f497.tar.gz forums-918914926b13253ef3a9af40bcdb0ea8b900f497.tar.bz2 forums-918914926b13253ef3a9af40bcdb0ea8b900f497.tar.xz forums-918914926b13253ef3a9af40bcdb0ea8b900f497.zip | |
- request_var updates
- added group selection to pm filter
- fixed activation/deletion of inactive user accounts in admin index
- fixed some color swatch bugs
git-svn-id: file:///svn/phpbb/trunk@5152 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/admin_bbcodes.php')
| -rw-r--r-- | phpBB/adm/admin_bbcodes.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/adm/admin_bbcodes.php b/phpBB/adm/admin_bbcodes.php index 642e863d92..782191de87 100644 --- a/phpBB/adm/admin_bbcodes.php +++ b/phpBB/adm/admin_bbcodes.php @@ -186,7 +186,7 @@ switch ($mode) if ($mode == 'create') { - // TODO: look for SQL incompatibilities + /* TODO: look for SQL incompatibilities // NOTE: I'm sure there was another simpler (and obvious) way of finding a suitable bbcode_id $sql = 'SELECT b1.bbcode_id FROM ' . BBCODES_TABLE . ' b1, ' . BBCODES_TABLE . ' b2 @@ -197,6 +197,12 @@ switch ($mode) $result = $db->sql_query_limit($sql, 1); $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); +*/ + $sql = 'SELECT MAX(bbcode_id) as bbcode_id + FROM ' . BBCODES_TABLE; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); if ($row) { @@ -327,7 +333,7 @@ function build_regexp($msg_bbcode, $msg_html) $tokens = array( 'URL' => array( - '!([a-z0-9]+://)?(.*?[^ \t\n\r<"]*)!ise' => "(('\$1') ? '\$1\$2' : 'http://\$2')" + '!([a-z0-9]+://)?([^?].*?[^ \t\n\r<"]*)!ie' => "(('\$1') ? '\$1\$2' : 'http://\$2')" ), 'LOCAL_URL' => array( '!([^:]+/[^ \t\n\r<"]*)!' => '$1' |