From e99af0dfd6ada78624131a1ffe98f427be27f6b4 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 5 Nov 2009 09:06:41 +0000 Subject: [PATCH] revert of the change in r28264 as it would allow crossside scripting --- phpgwapi/inc/class.html.inc.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php index efeafa0352..b70fe95464 100644 --- a/phpgwapi/inc/class.html.inc.php +++ b/phpgwapi/inc/class.html.inc.php @@ -143,9 +143,7 @@ class html static function activate_links($content) { if (!$content || strlen($content) < 20) return $content; // performance - // this seems to be needed as the preg_replace to match things beginning with http:// (or other protocols) - // seems to be throwing out & and leaving &; - which is breaking links. - $content = htmlspecialchars_decode($content); + // Exclude everything which is already a link $NotAnchor = '(?