diff options
author | Thomas Bruederli <thomas@roundcube.net> | 2012-11-12 15:51:21 +0100 |
---|---|---|
committer | Thomas Bruederli <thomas@roundcube.net> | 2012-11-12 15:51:21 +0100 |
commit | bc66f7d6d208ac99dcec57992c4eb955570d85bc (patch) | |
tree | 4b8c33fc0a2e68fe589635594616bfa4167b88b2 | |
parent | 3806f168b9ca797ad6e6bfa0743345b00c612e2a (diff) |
Avoid deprecated template warnings in extended skins
-rw-r--r-- | program/include/rcube_output_html.php | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/program/include/rcube_output_html.php b/program/include/rcube_output_html.php index db947bd2b..7b186b99d 100644 --- a/program/include/rcube_output_html.php +++ b/program/include/rcube_output_html.php @@ -447,12 +447,15 @@ 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"; - rcube::raise_error(array( - 'code' => 502, 'type' => 'php', - 'file' => __FILE__, 'line' => __LINE__, - 'message' => "Using deprecated template '" . $this->deprecated_templates[$realname] - . "' in $skin_path/templates. Please rename to '$realname'"), - true, false); + + if (is_readable($path)) { + rcube::raise_error(array( + 'code' => 502, 'type' => 'php', + 'file' => __FILE__, 'line' => __LINE__, + 'message' => "Using deprecated template '" . $this->deprecated_templates[$realname] + . "' in $skin_path/templates. Please rename to '$realname'"), + true, false); + } } if (is_readable($path)) { |