diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-12-11 14:45:21 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-12-11 14:45:21 +0100 |
| commit | 876f4ebc603ff3c654e44f9bf472ab9164977e20 (patch) | |
| tree | 58dcfec31cf56f21a5ab4e04f737cc438f53ddbe /program/include/rcmail_output_html.php | |
| parent | 463ce6848da1d699031ea0cbd892e00a62fac979 (diff) | |
| parent | b01d84d0f7c8b29c9dc52c717708f28a72ecf08e (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; } |