Merge branch 'master' of zucker.schokokeks.org:webinterface (6d31d91)

inc/base.php

@@@ -35,11 -36,13 +35,13 @@@ function config($key
      return $config[$key];
    
    /* read configuration from database */
 -  $options = db_query( "SELECT `key`, value FROM misc.config" );
 +  $options = DB::query( "SELECT `key`, value FROM misc.config" );
    
-   while( $object = $options->fetch_assoc() ) {
+   while( $object = mysql_fetch_assoc( $options ) ) {
+     if (!array_key_exists($object['key'], $config)) {
        $config[$object['key']]=$object['value'];
      }
+   }
    // Sonst wird das Passwort des webadmin-Users mit ausgegeben
    $debug_config = $config;
    unset($debug_config['db_pass']);


...	...	@@@ -35,11 -36,13 +35,13 @@@ function config($key
36	35	return $config[$key];
37	36
38	37	/* read configuration from database */
39	38	- $options = db_query( "SELECT `key`, value FROM misc.config" );
40	39	+ $options = DB::query( "SELECT `key`, value FROM misc.config" );
41	40
42		- while( $object = $options->fetch_assoc() ) {
	41	+ while( $object = mysql_fetch_assoc( $options ) ) {
	42	+ if (!array_key_exists($object['key'], $config)) {
43	43	$config[$object['key']]=$object['value'];
44	44	}
	45	+ }
45	46	// Sonst wird das Passwort des webadmin-Users mit ausgegeben
46	47	$debug_config = $config;
47	48	unset($debug_config['db_pass']);
48	49

webinterface.git