From 2a8560c9c62c16a2f044f37bfd4adf152c191ee5 Mon Sep 17 00:00:00 2001 From: vlakoff Date: Tue, 20 May 2014 10:32:35 +0200 Subject: Regex fixes * Replace wrong "wwww." with "www." * Escape dot --- system/helpers/text_helper.php | 2 +- system/libraries/Email.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'system') diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php index ca19ab98b..7e15c1934 100644 --- a/system/helpers/text_helper.php +++ b/system/helpers/text_helper.php @@ -460,7 +460,7 @@ if ( ! function_exists('word_wrap')) while (mb_strlen($line) > $charlim) { // If the over-length word is a URL we won't wrap it - if (preg_match('!\[url.+\]|://|wwww.!', $line)) + if (preg_match('!\[url.+\]|://|www\.!', $line)) { break; } diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 63b7dc31c..2595032c9 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1203,7 +1203,7 @@ class CI_Email { do { // If the over-length word is a URL we won't wrap it - if (preg_match('!\[url.+\]|://|wwww.!', $line)) + if (preg_match('!\[url.+\]|://|www\.!', $line)) { break; } -- cgit v1.2.3-24-g4f1b