From e99ff4c0ba842ad76199bda598c53c1a50bdd750 Mon Sep 17 00:00:00 2001 From: esanchezm Date: Thu, 2 Apr 2009 14:31:10 +0000 Subject: [PATCH] 2009-04-02 Esteban Sanchez * include/functions_config.php: Fixed a bug when the theme was not given on update_config(). * godmode/setup/setup.php: Removed unneccesary include of functions_themes.php git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1591 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ pandora_console/godmode/setup/setup.php | 4 +--- pandora_console/include/functions_config.php | 3 ++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index f8361c7d04..3f4b273579 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2009-04-02 Esteban Sanchez + + * include/functions_config.php: Fixed a bug when the theme was not + given on update_config(). + + * godmode/setup/setup.php: Removed unneccesary include of + functions_themes.php + 2009-04-02 Esteban Sanchez * include/functions_reporting.php: Added alert API on diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php index f9596bfac3..ceea7580e2 100644 --- a/pandora_console/godmode/setup/setup.php +++ b/pandora_console/godmode/setup/setup.php @@ -39,9 +39,7 @@ enterprise_include ('godmode/setup/setup.php'); to add it there. */ -require_once ('include/functions_themes.php'); - -echo "

".__('Setup')." > "; +echo "

".__('Setup')." » "; echo __('General configuration')."

"; $table->width = '90%'; diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 4ab58faea8..cb354b36b2 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -78,7 +78,8 @@ function update_config () { return; $style = (string) get_parameter ('style', $config["style"]); - $style = substr ($style, 0, strlen ($style) - 4); + if ($style != $config['style']) + $style = substr ($style, 0, strlen ($style) - 4); /* Workaround for ugly language and language_code missmatch */ $config['language_code'] = (string) get_parameter ('language', $config["language"]);