summaryrefslogtreecommitdiff
path: root/program/lib/Roundcube/rcube_string_replacer.php
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-10-12 12:28:40 +0200
committerAleksander Machniak <alec@alec.pl>2013-10-12 12:28:40 +0200
commitd1abd8e339a1346b02ebbca5365cd824adf5f897 (patch)
treeeb35fd54930cbccaa6d392c1169240f913f25773 /program/lib/Roundcube/rcube_string_replacer.php
parentb5216621ba79599157ac868c7f9b935a54e39b57 (diff)
Fix infinite loop in rcube_utils::mod_css_styles() after recent changes in rcube_string_replacer
Diffstat (limited to 'program/lib/Roundcube/rcube_string_replacer.php')
-rw-r--r--program/lib/Roundcube/rcube_string_replacer.php6
1 files changed, 3 insertions, 3 deletions
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 . '##';
}
/**