Avoid deprecated template warnings in extended skins

12 years ago · bc66f7d6d2
parent 3806f168b9
commit bc66f7d6d2
1 changed files with 9 additions and 6 deletions
--- a/program/include/rcube_output_html.php
+++ b/program/include/rcube_output_html.php
@ -447,6 +447,8 @@ class rcube_output_html extends rcube_output
            // fallback to deprecated template names
            if (!is_readable($path) && $this->deprecated_templates[$realname]) {
                $path = "$skin_path/templates/" . $this->deprecated_templates[$realname] . ".html";
+
+                if (is_readable($path)) {
                    rcube::raise_error(array(
                        'code' => 502, 'type' => 'php',
                        'file' => __FILE__, 'line' => __LINE__,
@ -454,6 +456,7 @@ class rcube_output_html extends rcube_output
                            . "' in $skin_path/templates. Please rename to '$realname'"),
                        true, false);
                }
+            }

            if (is_readable($path)) {
                $this->config->set('skin_path', $skin_path);