aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-02-21 10:32:19 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-02-21 10:32:19 +0000
commitcddf792dea0195783c20094023272c5713faf2b3 (patch)
tree2d3dbb503514b53e8c9c8b842c79681c5e7136a3 /phpBB/includes/acp
parent22b9a9d886431af57985d11a23f9f2ee60a6bc5a (diff)
downloadforums-cddf792dea0195783c20094023272c5713faf2b3.tar
forums-cddf792dea0195783c20094023272c5713faf2b3.tar.gz
forums-cddf792dea0195783c20094023272c5713faf2b3.tar.bz2
forums-cddf792dea0195783c20094023272c5713faf2b3.tar.xz
forums-cddf792dea0195783c20094023272c5713faf2b3.zip
- implementing David's proposed expression changes (some of them already noted within the events CCP)
git-svn-id: file:///svn/phpbb/trunk@5566 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r--phpBB/includes/acp/acp_users.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 927a6436f3..af9918ea37 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -46,7 +46,8 @@ class acp_users
if ($ipwhois = user_ipwhois($user_ip))
{
- $ipwhois = trim(preg_replace('#(\s+?)([\w\-\._\+]+?@[\w\-\.]+?)(\s+?)#s', '\1<a href="mailto:\2">\2</a>\3', $ipwhois));
+ $ipwhois = preg_replace('#(\s)([\w\-\._\+]+@[\w\-\.]+)(\s)#', '\1<a href="mailto:\2">\2</a>\3', $ipwhois);
+ $ipwhois = preg_replace('#(\s)(http:/{2}[^\s]*)(\s)#', '\1<a href="\2" target="_blank">\2</a>\3', $ipwhois);
}
$template->assign_vars(array(