diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-12-13 19:56:41 +0100 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-12-13 19:56:41 +0100 |
| commit | f7136bd21705d8a9edd1110f8bf91dca759d2fb3 (patch) | |
| tree | 89a37d7a79e544e8845095029be150685785bdab /program/include/rcmail_output_html.php | |
| parent | dc67f38cdfd4390a6f5b302ebc177565536e4447 (diff) | |
| parent | 87ec1de655af6cdd0a0bbf14e05dce6a3f792f85 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/include/rcmail_output_html.php')
| -rw-r--r-- | program/include/rcmail_output_html.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index 1290e173e..76342c245 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -670,7 +670,10 @@ class rcmail_output_html extends rcmail_output */ public function just_parse($input) { - return $this->parse_xml($input); + $input = $this->parse_conditions($input); + $input = $this->parse_xml($input); + + return $input; } |