From 4230651565e386662a6931396c3d4a6b33b4f30d Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 18 Jun 2008 03:13:04 -0400
Subject: [PATCH] Add fallback to old 'skin_path' property + indent with spaces instead of tabs
---
program/include/rcube_template.php | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 5bae3f7..53808bd 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -57,8 +57,8 @@
//$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 @@
*/
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 @@
*/
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));
}
/**
--
Gitblit v1.9.1