Merge branch 'master' into develop

xpressengine · Oct 10, 2018 · b134c37 · b134c37
2 parents 7603148 + ece6052
commit b134c37
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php
@@ -995,7 +995,7 @@ private function _applyEscapeOption($str, $escape_option = 'noescape')
  				return "escape({$str}, false)";
  			case 'auto':
  			default:
- 				return "(\$this->config->autoescape === 'on' ? escape({$str}, false) : {$str})";
+ 				return "(\$this->config->autoescape === 'on' ? escape({$str}, false) : ({$str}))";
  		}
  	}