diff options
author | Robin Appelman <icewind1991@gmail.com> | 2011-06-13 23:15:15 +0200 |
---|---|---|
committer | Robin Appelman <icewind1991@gmail.com> | 2011-06-14 01:20:41 +0200 |
commit | 1e0fe05bef4a935c23d290ebda67059679da629f (patch) | |
tree | f15a76784f45a6c31ec55349f80084e467a9647d /lib/config.php | |
parent | 80194daec7b612a356daac7c13ccc904a70ffbbf (diff) | |
download | nextcloud-server-1e0fe05bef4a935c23d290ebda67059679da629f.tar.gz nextcloud-server-1e0fe05bef4a935c23d290ebda67059679da629f.zip |
fix error with empty config file
Diffstat (limited to 'lib/config.php')
-rw-r--r-- | lib/config.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/config.php b/lib/config.php index 6af9fcbe5ad..60c6739a3fe 100644 --- a/lib/config.php +++ b/lib/config.php @@ -139,7 +139,7 @@ class OC_CONFIG{ // Include the file, save the data from $CONFIG include( "$SERVERROOT/config/config.php" ); - if( isset( $CONFIG ) || is_array( $CONFIG )){ + if( isset( $CONFIG ) && is_array( $CONFIG )){ self::$cache = $CONFIG; } |