Skip to content
Snippets Groups Projects
Commit 54b53b9e authored by Peter Rotich's avatar Peter Rotich
Browse files

Merge pull request #2223 from greezybacon/oops/html-balance-urlencode


variable: The HTML balancing system urlencodes @Hamsteren 

Reviewed-By: default avatarPeter Rotich <peter@osticket.com>
parents 90f786bb f536f7c0
Branches
Tags
No related merge requests found
...@@ -26,7 +26,7 @@ class VariableReplacer { ...@@ -26,7 +26,7 @@ class VariableReplacer {
var $errors; var $errors;
function VariableReplacer($start_delim='%{', $end_delim='}') { function VariableReplacer($start_delim='(?:%{|%%7B)', $end_delim='(?:}|%7D)') {
$this->start_delim = $start_delim; $this->start_delim = $start_delim;
$this->end_delim = $end_delim; $this->end_delim = $end_delim;
...@@ -131,7 +131,8 @@ class VariableReplacer { ...@@ -131,7 +131,8 @@ class VariableReplacer {
$vars = array(); $vars = array();
foreach($result[0] as $k => $v) { foreach($result[0] as $k => $v) {
if(isset($vars[$v])) continue; if(isset($vars[$v])) continue;
$val=$this->_resolveVar($result[1][$k]); // Format::html_balance() may urlencode() the contents here
$val=$this->_resolveVar(rawurldecode($result[1][$k]));
if($val!==false) if($val!==false)
$vars[$v] = $val; $vars[$v] = $val;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment