only call config->get() once

11 years ago · fb4474aca9
parent d81d69377a
commit fb4474aca9
1 changed files with 12 additions and 10 deletions
--- 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);