From: kondou <kondou@ts.unde.re>
Date: Wed, 3 Jul 2013 14:00:23 +0000 (+0200)
Subject: Suppress warning in setup if config doesn't exist
X-Git-Tag: v6.0.0alpha2~533
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=aa7d8edd14603cc06253fc018573382f60873911;p=nextcloud-server.git

Suppress warning in setup if config doesn't exist
---

diff --git a/lib/config.php b/lib/config.php
index 3cbb89fb981..fcd0a9d7c3c 100644
--- a/lib/config.php
+++ b/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);
 			}