From df229677457d1f59d08c14990514273114fed87d Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sun, 10 Feb 2013 10:03:18 -0500
Subject: [PATCH] Let some env variables survive reset(); don't show taskbar and top line in framed error pages (#1488938)

---
 skins/larry/templates/error.html |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/skins/larry/templates/error.html b/skins/larry/templates/error.html
index cd0fc96..a65733e 100644
--- a/skins/larry/templates/error.html
+++ b/skins/larry/templates/error.html
@@ -4,9 +4,12 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body>
-
+<roundcube:if condition="!env:framed" />
+<body class="error">
 <roundcube:include file="/includes/header.html" />
+<roundcube:else />
+<body class="error iframe">
+<roundcube:endif />
 
 <div class="uibox centerbox errorbox">
 $__page_content

--
Gitblit v1.9.1