Corrected template parsing and output encoding

git-svn-id: https://svn.roundcube.net/trunk@364 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 2 insertions, 1 deletions

diff --git a/roundcubemail/program/include/rcube_shared.inc b/roundcubemail/program/include/rcube_shared.inc
index 11af48205..7f3771b08 100644
--- a/roundcubemail/program/include/rcube_shared.inc
+++ b/roundcubemail/program/include/rcube_shared.inc
@@ -215,7 +215,8 @@ class rcube_html_page
     if(($fpos = strrpos($output_lc, '</body>')) ||
        ($fpos = strrpos($output_lc, '</html>')))
       {
-      $output = substr($output,0,$fpos) . "$__page_footer\n" . substr($output,$fpos,strlen($output));
+      $fpos -= 8;
+      $output = substr($output,0,$fpos) . "$__page_footer\n" . substr($output,$fpos);
       }
     else
       $output .= "\n$__page_footer";