From d81d69377a53f347eab1bef898dc405d3b5940e9 Mon Sep 17 00:00:00 2001
From: PhilW <roundcube@tehinterweb.co.uk>
Date: Mon, 26 Aug 2013 08:45:30 -0400
Subject: [PATCH] use template file name rather than special attribute
---
program/include/rcmail_output_html.php | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
index 39f79d1..ebf71cb 100644
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@@ -926,11 +926,11 @@
$attrib += array('alt' => $this->xml_command(array('', 'object', 'name="productname"')));
if (is_array($this->config->get('skin_logo'))) {
- if (isset($attrib['type']) && array_key_exists($attrib['type'], $this->config->get('skin_logo'))) {
- $attrib['src'] = $this->config->get('skin_logo')[$attrib['type']];
+ if ($logo = $this->config->get('skin_logo')[$this->template_name]) {
+ $attrib['src'] = $logo;
}
- elseif (array_key_exists('default', $this->config->get('skin_logo'))) {
- $attrib['src'] = $this->config->get('skin_logo')['default'];
+ elseif ($logo = $this->config->get('skin_logo')['*']) {
+ $attrib['src'] = $logo;
}
}
elseif ($logo = $this->config->get('skin_logo')) {
--
Gitblit v1.9.1