From d1abd8e339a1346b02ebbca5365cd824adf5f897 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sat, 12 Oct 2013 12:28:40 +0200 Subject: Fix infinite loop in rcube_utils::mod_css_styles() after recent changes in rcube_string_replacer --- program/lib/Roundcube/rcube_string_replacer.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'program/lib/Roundcube/rcube_string_replacer.php') diff --git a/program/lib/Roundcube/rcube_string_replacer.php b/program/lib/Roundcube/rcube_string_replacer.php index 85ccc95ee..77b91d18b 100644 --- a/program/lib/Roundcube/rcube_string_replacer.php +++ b/program/lib/Roundcube/rcube_string_replacer.php @@ -24,7 +24,7 @@ */ class rcube_string_replacer { - public static $pattern = '/##str_replacement\{([0-9]+)\}##/'; + public static $pattern = '/##str_replacement_(\d+)##/'; public $mailto_pattern; public $link_pattern; public $linkref_index; @@ -50,7 +50,7 @@ class rcube_string_replacer ."@$utf_domain" // domain-part ."(\?[$url1$url2]+)?" // e.g. ?subject=test... .")/"; - $this->linkref_index = '/\[([^\]#]+)\](:?\s*##str_replacement\{(\d+)\}##)/'; + $this->linkref_index = '/\[([^\]#]+)\](:?\s*##str_replacement_(\d+)##)/'; $this->linkref_pattern = '/\[([^\]#]+)\]/'; $this->options = $options; @@ -74,7 +74,7 @@ class rcube_string_replacer */ public function get_replacement($i) { - return '##str_replacement{'.$i.'}##'; + return '##str_replacement_' . $i . '##'; } /** -- cgit v1.2.3