From b4f7c665bbe31d4ddbdca8c9f89eedb1d6187582 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 26 May 2009 08:28:04 -0400
Subject: [PATCH] Tweak default skin with better icons (sprites) and move IE hacks to an external file included by conditional comments
---
program/include/rcube_template.php | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 21363f2..d8c2176 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;
@@ -795,9 +796,6 @@
}
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'];
}
}
--
Gitblit v1.9.1