summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include/rcube_template.php
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-06-18 07:13:04 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-06-18 07:13:04 +0000
commite6dcb9432acd9770ed73b003a239f2ba75b8617a (patch)
treeaea7ff50683894068a6665572130df7655379d1d /roundcubemail/program/include/rcube_template.php
parent83aa51243e5c25ebbcc8a82ede1eae4eb352f117 (diff)
Add fallback to old 'skin_path' property + indent with spaces instead of tabs
git-svn-id: https://svn.roundcube.net/trunk@1558 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/rcube_template.php')
-rwxr-xr-xroundcubemail/program/include/rcube_template.php22
1 files changed, 11 insertions, 11 deletions
diff --git a/roundcubemail/program/include/rcube_template.php b/roundcubemail/program/include/rcube_template.php
index 5bae3f790..53808bd2b 100755
--- a/roundcubemail/program/include/rcube_template.php
+++ b/roundcubemail/program/include/rcube_template.php
@@ -57,8 +57,8 @@ class rcube_template extends rcube_html_page
//$this->framed = $framed;
$this->set_env('task', $task);
- // load the correct skin (in case user-defined)
- $this->set_skin($this->config['skin']);
+ // load the correct skin (in case user-defined)
+ $this->set_skin($this->config['skin']);
// add common javascripts
$javascript = 'var '.JS_OBJECT_NAME.' = new rcube_webmail();';
@@ -110,13 +110,13 @@ class rcube_template extends rcube_html_page
*/
public function set_skin($skin)
{
- if (!empty($skin) && is_dir('skins/'.$skin) && is_readable('skins/'.$skin))
- $skin_path = 'skins/'.$skin;
- else
- $skin_path = $this->config['skin_path'] ? $this->config['skin_path'] : 'skins/default';
-
- $this->app->config->set('skin_path', $skin_path);
- $this->config['skin_path'] = $skin_path;
+ if (!empty($skin) && is_dir('skins/'.$skin) && is_readable('skins/'.$skin))
+ $skin_path = 'skins/'.$skin;
+ else
+ $skin_path = $this->config['skin_path'] ? $this->config['skin_path'] : 'skins/default';
+
+ $this->app->config->set('skin_path', $skin_path);
+ $this->config['skin_path'] = $skin_path;
}
/**
@@ -127,9 +127,9 @@ class rcube_template extends rcube_html_page
*/
public function template_exists($name)
{
- $filename = $this->config['skin_path'] . '/templates/' . $name . '.html';
+ $filename = $this->config['skin_path'] . '/templates/' . $name . '.html';
- return (is_file($filename) && is_readable($filename));
+ return (is_file($filename) && is_readable($filename));
}
/**