From 6141930f1588de1a1cb411a5aae1ce28c4ff0c51 Mon Sep 17 00:00:00 2001 From: Nik Date: Tue, 2 Sep 2014 15:16:20 +1200 Subject: [PATCH] Copy SSViewer rewrite_hash_links regexp to SSTemplateParser As this is meant to represent the same functionality in two different areas, it should behave the same way in both. --- view/SSTemplateParser.php | 4 ++-- view/SSTemplateParser.php.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/view/SSTemplateParser.php b/view/SSTemplateParser.php index 1abe84845..3c11980dc 100644 --- a/view/SSTemplateParser.php +++ b/view/SSTemplateParser.php @@ -4682,8 +4682,8 @@ class SSTemplateParser extends Parser implements TemplateParser { // TODO: This is pretty ugly & gets applied on all files not just html. I wonder if we can make this // non-dynamically calculated $text = preg_replace( - '/href\s*\=\s*\"\#/', - 'href="\' . (Config::inst()->get(\'SSViewer\', \'rewrite_hash_links\') ?' . + '/(]+href *= *)"#/i', + '\\1"\' . (Config::inst()->get(\'SSViewer\', \'rewrite_hash_links\') ?' . ' strip_tags( $_SERVER[\'REQUEST_URI\'] ) : "") . \'#', $text diff --git a/view/SSTemplateParser.php.inc b/view/SSTemplateParser.php.inc index 255482aae..74fc27bbe 100644 --- a/view/SSTemplateParser.php.inc +++ b/view/SSTemplateParser.php.inc @@ -1136,8 +1136,8 @@ class SSTemplateParser extends Parser implements TemplateParser { // TODO: This is pretty ugly & gets applied on all files not just html. I wonder if we can make this // non-dynamically calculated $text = preg_replace( - '/href\s*\=\s*\"\#/', - 'href="\' . (Config::inst()->get(\'SSViewer\', \'rewrite_hash_links\') ?' . + '/(]+href *= *)"#/i', + '\\1"\' . (Config::inst()->get(\'SSViewer\', \'rewrite_hash_links\') ?' . ' strip_tags( $_SERVER[\'REQUEST_URI\'] ) : "") . \'#', $text