summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorPhilW <roundcube@tehinterweb.co.uk>2013-08-26 13:45:30 +0100
committerPhilW <roundcube@tehinterweb.co.uk>2013-08-26 13:45:30 +0100
commitd81d69377a53f347eab1bef898dc405d3b5940e9 (patch)
treed0491d55f6033f9ba57940edfbce26f824439dad /program
parenta77504aeacd4516156267fe10eeca1bfffcacf87 (diff)
use template file name rather than special attribute
Diffstat (limited to 'program')
-rw-r--r--program/include/rcmail_output_html.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
index 39f79d119..ebf71cb3f 100644
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@@ -926,11 +926,11 @@ class rcmail_output_html extends rcmail_output
$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')) {