Fixing syntax error generated by last merge conflict

cakephp · Apr 13, 2010 · 388bca4 · 388bca4
1 parent a6b83cd
commit 388bca4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php
@@ -121,8 +121,9 @@ function autoLinkUrls($text, $htmlOptions = array()) {
 		$options = var_export($htmlOptions, true);
 		$text = preg_replace_callback('#(?<!href="|">)((?:https?|ftp|nntp)://[^\s<>()]+)#i', create_function('$matches',
 			'$Html = new HtmlHelper(); $Html->tags = $Html->loadConfig(); return $Html->link($matches[0], $matches[0],' . $options . ');'), $text);
+
 		return preg_replace_callback('#(?<!href="|">)(?<!http://|https://|ftp://|nntp://)(www\.[^\n\%\ <]+[^<\n\%\,\.\ <])(?<!\))#i',
-			create_function('$matches', '$Html = new HtmlHelper(); $Html->tags = $Html->loadConfig(); return $Html->link($matches[0], "http://" . strtolower($matches[0]),' . $linkOptions . ');'), $text);
+			create_function('$matches', '$Html = new HtmlHelper(); $Html->tags = $Html->loadConfig(); return $Html->link($matches[0], "http://" . strtolower($matches[0]),' . $options . ');'), $text);
 	}
 
 /**