From bb5dd5916bdb4e789300799f9e6a2be831e6bf14 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 27 May 2009 06:09:09 -0400
Subject: [PATCH] - reverted accidentally removed code
---
program/include/rcube_template.php | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index b597c55..d82379d 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -339,10 +339,10 @@
$plugin = $temp[0];
$name = $temp[1];
$skin_dir = $plugin . '/skins/' . $this->config['skin'];
- $skin_path = $this->config['plugins_dir'] . '/' . $skin_dir;
+ $skin_path = $this->app->plugins->dir . $skin_dir;
if (!is_dir($skin_path)) { // fallback to default skin
$skin_dir = $plugin . '/skins/default';
- $skin_path = $this->config['plugins_dir'] . '/' . $skin_dir;
+ $skin_path = $this->app->plugins->dir . $skin_dir;
}
}
@@ -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