fehler beim merge behoben (8fe42e3) - webinterface.git

inc/base.php

@@ -37,7 +37,7 @@ function config($key)
   /* read configuration from database */
   $options = DB::query( "SELECT `key`, value FROM misc.config" );
   
-  while( $object = mysql_fetch_assoc( $options ) ) {
+  while( $object = $options->fetch_assoc() ) {
     if (!array_key_exists($object['key'], $config)) {
       $config[$object['key']]=$object['value'];
     }


...	...	@@ -37,7 +37,7 @@ function config($key)
37	37	/* read configuration from database */
38	38	$options = DB::query( "SELECT `key`, value FROM misc.config" );
39	39
40		- while( $object = mysql_fetch_assoc( $options ) ) {
	40	+ while( $object = $options->fetch_assoc() ) {
41	41	if (!array_key_exists($object['key'], $config)) {
42	42	$config[$object['key']]=$object['value'];
43	43	}
44	44