- merged settings branch, fixes #134

2010-04-13 05:41:09 +00:00
parent 98e79d933c
commit cfaae63657
20 changed files with 395 additions and 23 deletions
--- a/lib/init.php
+++ b/lib/init.php
@@ -150,7 +150,7 @@ if(get_magic_quotes_gpc())
 */

 $settings_data = loadConfigArrayDir('./actions/admin/settings/');
-$settings = loadSettings(&$settings_data, &$db);
+$settings = loadSettings($settings_data, $db);

 /*
 * when upgrading from syscp, the header-graphic gets lost