diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-01-15 18:49:54 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-01-15 18:49:54 +0000 |
| commit | f68771d64ce689fe4e9300c88d5d53b0c685c6ef (patch) | |
| tree | 6e4c441547692d13c8da09ee1ac0dc8ef2770b3d /phpBB/includes/message_parser.php | |
| parent | 2e4ae506a60fb062a5f93e71aa5bf3e0e8b6635e (diff) | |
| download | forums-f68771d64ce689fe4e9300c88d5d53b0c685c6ef.tar forums-f68771d64ce689fe4e9300c88d5d53b0c685c6ef.tar.gz forums-f68771d64ce689fe4e9300c88d5d53b0c685c6ef.tar.bz2 forums-f68771d64ce689fe4e9300c88d5d53b0c685c6ef.tar.xz forums-f68771d64ce689fe4e9300c88d5d53b0c685c6ef.zip | |
- bugfixes
- do not hardcode url bbcode tag (please change the bitfield accordingly - see schema file!)
git-svn-id: file:///svn/phpbb/trunk@5063 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index aaa6c18268..bc8ce4033a 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -179,7 +179,7 @@ class bbcode_firstpass extends bbcode '#<!\-\- e \-\-><a href="mailto:(.*?)">.*?</a><!\-\- e \-\->#', '#<!\-\- m \-\-><a href="(.*?)" target="_blank">.*?</a><!\-\- m \-\->#', '#<!\-\- w \-\-><a href="http:\/\/(.*?)" target="_blank">.*?</a><!\-\- w \-\->#', - '#<!\-\- l \-\-><a href="(.*?)" target="_blank">.*?</a><!\-\- l \-\->#', + '#<!\-\- l \-\-><a href="(.*?)">.*?</a><!\-\- l \-\->#', '#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '#<!\-\- h \-\-><(.*?)><!\-\- h \-\->#', ); @@ -821,7 +821,7 @@ class parse_message extends bbcode_firstpass // relative urls for this board $match[] = '#(^|[\n ]|\()(' . preg_quote($server_protocol . trim($server_name) . $server_port . preg_replace('/^\/?(.*?)(\/)?$/', '$1', trim($script_path)), '#') . ')/(.*?([^ \t\n\r<"\'\)]*)?)#i'; - $replace[] = '$1<!-- l --><a href="$2/$3" target="_blank">$3</a><!-- l -->'; + $replace[] = '$1<!-- l --><a href="$2/$3">$3</a><!-- l -->'; // matches a xxxx://aaaaa.bbb.cccc. ... $match[] = '#(^|[\n ]|\()([\w]+?://.*?([^ \t\n\r<"\'\)]*)?)#ie'; @@ -1310,12 +1310,12 @@ class fulltext_search switch (SQL_LAYER) { case 'mysql': - case 'mysql4': $sql = 'INSERT INTO ' . SEARCH_WORD_TABLE . ' (word_text) VALUES ' . implode(', ', preg_replace('#^(.*)$#', '(\'$1\')', $new_words)); $db->sql_query($sql); break; + case 'mysql4': case 'mssql': case 'sqlite': $sql = 'INSERT INTO ' . SEARCH_WORD_TABLE . ' (word_text) ' . implode(' UNION ALL ', preg_replace('#^(.*)$#', "SELECT '\$1'", $new_words)); |