From db51c0539af5a9d2c386b0c7a5738022a4f0bb30 Mon Sep 17 00:00:00 2001 From: Dave Date: Wed, 21 Sep 2011 17:50:48 -0300 Subject: [PATCH] Fix TextHelper::autoLinkUrls() from linking iframes iframe and img elements should not be autolinked. Fixes #GH-208 --- lib/Cake/View/Helper/TextHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Cake/View/Helper/TextHelper.php b/lib/Cake/View/Helper/TextHelper.php index 61ef8143d59..0cebdb1d208 100644 --- a/lib/Cake/View/Helper/TextHelper.php +++ b/lib/Cake/View/Helper/TextHelper.php @@ -120,7 +120,7 @@ public function stripLinks($text) { public function autoLinkUrls($text, $htmlOptions = array()) { $this->_linkOptions = $htmlOptions; $text = preg_replace_callback( - '#(?)((?:https?|ftp|nntp)://[^\s<>()]+)#i', + '#(?)((?:https?|ftp|nntp)://[^\s<>()]+)#i', array(&$this, '_linkBareUrl'), $text );