diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-30 14:16:13 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-30 14:16:13 +0000 |
| commit | 5bc5a1ee5a708fcdb89c5bd478cd9b93787635fe (patch) | |
| tree | 4115694d092d1ddf3ddf27fcfb7c2b453b389f6a /phpBB/includes/functions.php | |
| parent | cb3a794672f0ff519ae916c81aaa6599a8a91b3e (diff) | |
| download | forums-5bc5a1ee5a708fcdb89c5bd478cd9b93787635fe.tar forums-5bc5a1ee5a708fcdb89c5bd478cd9b93787635fe.tar.gz forums-5bc5a1ee5a708fcdb89c5bd478cd9b93787635fe.tar.bz2 forums-5bc5a1ee5a708fcdb89c5bd478cd9b93787635fe.tar.xz forums-5bc5a1ee5a708fcdb89c5bd478cd9b93787635fe.zip | |
email preg
git-svn-id: file:///svn/phpbb/trunk@7437 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 0592401756..c192cf8264 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2637,7 +2637,7 @@ function make_clickable($text, $server_url = false, $class = 'postlink') $magic_url_replace[] = "'\$1<!-- w --><a$class 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'; + $magic_url_match[] = '/(^|[\n\t (>])(' . get_preg_expression('email') . ')/ie'; $magic_url_replace[] = "'\$1<!-- e --><a href=\"mailto:\$2\">' . ((strlen('\$2') > 55) ? substr('\$2', 0, 39) . ' ... ' . substr('\$2', -10) : '\$2') . '</a><!-- e -->'"; } @@ -3271,7 +3271,7 @@ function get_preg_expression($mode) return array( '#<!\-\- e \-\-><a href="mailto:(.*?)">.*?</a><!\-\- e \-\->#', '#<!\-\- l \-\-><a (?:class="[\w-]+" )?href="(.*?)(?:(&|\?)sid=[0-9a-f]{32})?">.*?</a><!\-\- l \-\->#', - '#<!\-\- ([mw]) \-\-><a href="(.*?)">.*?</a><!\-\- \1 \-\->#', + '#<!\-\- ([mw]) \-\-><a (?:class="[\w-]+" )?href="(.*?)">.*?</a><!\-\- \1 \-\->#', '#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '#<!\-\- .*? \-\->#s', '#<.*?>#s', |