Suppress warning in setup if config doesn't exist

remotes/origin/stable6
kondou 12 years ago
parent 33e1ced53c
commit aa7d8edd14
  1. 2
      lib/config.php

@ -144,7 +144,7 @@ class OC_Config{
//Include file and merge config
foreach($config_files as $file){
include $file;
@include $file;
if( isset( $CONFIG ) && is_array( $CONFIG )) {
self::$cache = array_merge(self::$cache, $CONFIG);
}

Loading…
Cancel
Save