From f7136bd21705d8a9edd1110f8bf91dca759d2fb3 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 13 Dec 2012 13:56:41 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
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 1290e17..76342c2 100644
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@@ -670,7 +670,10 @@
*/
public function just_parse($input)
{
- return $this->parse_xml($input);
+ $input = $this->parse_conditions($input);
+ $input = $this->parse_xml($input);
+
+ return $input;
}
--
Gitblit v1.9.1