From dc2fc082d372cc58f6d660d89fa19788be0d4c34 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 30 May 2009 11:10:35 -0400
Subject: [PATCH] - After move/delete from 'show' action display next message instead of messages list (#1485887)
---
program/include/rcube_template.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index dc4b5e1..d82379d 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -587,6 +587,7 @@
else {
$incl = file_get_contents($path);
}
+ $incl = $this->parse_conditions($incl);
return $this->parse_xml($incl);
}
break;
@@ -765,10 +766,10 @@
if ($attrib['alt']) {
$attrib['alt'] = Q(rcube_label($attrib['alt'], $attrib['domain']));
}
+
// set title to alt attribute for IE browsers
if ($this->browser->ie && $attrib['title'] && !$attrib['alt']) {
$attrib['alt'] = $attrib['title'];
- unset($attrib['title']);
}
// add empty alt attribute for XHTML compatibility
@@ -796,6 +797,9 @@
else if (in_array($attrib['command'], $a_static_commands)) {
$attrib['href'] = rcmail_url($attrib['command']);
}
+ else if ($attrib['command'] == 'permaurl' && !empty($this->env['permaurl'])) {
+ $attrib['href'] = $this->env['permaurl'];
+ }
}
// overwrite attributes
--
Gitblit v1.9.1