diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-04-15 10:59:26 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-04-15 10:59:26 +0000 |
| commit | fb2454314450ad36dc5c1480749dad51d9d1c87e (patch) | |
| tree | dd503ebacd6c8b112193fb3739e779fce81333b8 /phpBB/includes/functions.php | |
| parent | 5cde784419c77fe808e03b47007ef8f12fa83049 (diff) | |
| download | forums-fb2454314450ad36dc5c1480749dad51d9d1c87e.tar forums-fb2454314450ad36dc5c1480749dad51d9d1c87e.tar.gz forums-fb2454314450ad36dc5c1480749dad51d9d1c87e.tar.bz2 forums-fb2454314450ad36dc5c1480749dad51d9d1c87e.tar.xz forums-fb2454314450ad36dc5c1480749dad51d9d1c87e.zip | |
- m_warn is no longer a local moderation permission
- magic urls should properly use html entities
- speed up posting on big boards, MAX(post_id) query can be simplified a lot in certain cases
- user IP list should be labelled with "Other users" [Bug #9707]
git-svn-id: file:///svn/phpbb/trunk@7355 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index d20002dd96..b36b902991 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2620,11 +2620,11 @@ function make_clickable($text, $server_url = false) // matches a xxxx://aaaaa.bbb.cccc. ... $magic_url_match[] = '#(^|[\n\t (])(' . get_preg_expression('url_inline') . ')#ie'; - $magic_url_replace[] = "'\$1<!-- m --><a href=\"\$2\">' . ((strlen('\$2') > 55) ? substr(str_replace('&', '&', '\$2'), 0, 39) . ' ... ' . substr(str_replace('&', '&', '\$2'), -10) : '\$2') . '</a><!-- m -->'"; + $magic_url_replace[] = "'\$1<!-- m --><a href=\"\$2\">' . ((strlen('\$2') > 55) ? str_replace('&', '&', substr(str_replace('&', '&', '\$2'), 0, 39)) . ' ... ' . str_replace('&', '&', substr(str_replace('&', '&', '\$2'), -10)) : '\$2') . '</a><!-- m -->'"; // matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing $magic_url_match[] = '#(^|[\n\t (])(' . get_preg_expression('www_url_inline') . ')#ie'; - $magic_url_replace[] = "'\$1<!-- w --><a href=\"http://\$2\">' . ((strlen('\$2') > 55) ? substr(str_replace('&', '&', '\$2'), 0, 39) . ' ... ' . substr(str_replace('&', '&', '\$2'), -10) : '\$2') . '</a><!-- w -->'"; + $magic_url_replace[] = "'\$1<!-- w --><a href=\"http://\$2\">' . ((strlen('\$2') > 55) ? str_replace('&', '&', substr(str_replace('&', '&', '\$2'), 0, 39)) . ' ... ' . str_replace('&', '&', substr(str_replace('&', '&', '\$2'), -10)) : '\$2') . '</a><!-- w -->'"; // matches an email@domain type address at the start of a line, or after a space or after what might be a BBCode. $magic_url_match[] = '/(^|[\n\t )])(' . get_preg_expression('email') . ')/ie'; |