From 412faba719fdd8a35707d42bbdbc66c0357b6648 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Fri, 27 May 2011 05:39:08 -0400 Subject: [PATCH] Removed the files favicon.ico and robots.txt from conf-custom directory as they are already present in conf directory. The conf-custom directory is only for local overrides of files from conf directory, so conf-custom must stay empty in the source tree to allow administrators to override files on their servers. --- interface/web/client/form/client.tform.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php index be3c631..eb61dc9 100644 --- a/interface/web/client/form/client.tform.php +++ b/interface/web/client/form/client.tform.php @@ -164,7 +164,7 @@ 'usertheme' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', - 'default' => 'default', + 'default' => $conf["theme"], 'value' => $themes_list, 'separator' => '', 'width' => '30', @@ -220,7 +220,7 @@ 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', - 'default' => '$conf["country"]', + 'default' => $conf["country"], 'datasource' => array ( 'type' => 'SQL', 'querystring' => 'SELECT iso,printable_name FROM country ORDER BY printable_name', 'keyfield'=> 'iso', -- Gitblit v1.9.1