diff options
Diffstat (limited to 'program/include/rcmail_output_html.php')
| -rw-r--r-- | program/include/rcmail_output_html.php | 22 | 
1 files changed, 12 insertions, 10 deletions
| diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index ebf71cb3f..6db559358 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -925,16 +925,18 @@ class rcmail_output_html extends rcmail_output                  else if ($object == 'logo') {                      $attrib += array('alt' => $this->xml_command(array('', 'object', 'name="productname"'))); -                    if (is_array($this->config->get('skin_logo'))) { -                       if ($logo = $this->config->get('skin_logo')[$this->template_name]) { -                           $attrib['src'] = $logo; -                       } -                       elseif ($logo = $this->config->get('skin_logo')['*']) { -                           $attrib['src'] = $logo; -                       } -                    } -                    elseif ($logo = $this->config->get('skin_logo')) { -                        $attrib['src'] = $logo; +                    if ($logo = $this->config->get('skin_logo')) { +                        if (is_array($logo)) { +                            if ($template_logo = $logo[$this->template_name]) { +                                $attrib['src'] = $template_logo; +                            } +                            elseif ($template_logo = $logo['*']) { +                                $attrib['src'] = $template_logo; +                            } +                        } +                        else { +                            $attrib['src'] = $logo; +                        }                      }                      $content = html::img($attrib); | 
