diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-24 15:32:29 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-24 15:32:29 +0200 |
| commit | 7b150dfa963d81889b8d40bf3956795c9a712aec (patch) | |
| tree | 30b73d83b7e59791848480a741390060d60c7605 /lib/app.php | |
| parent | 56c7ee799cb13f7a4db60663f60b76cdf223614b (diff) | |
| parent | 41898a473e8ece37c92e709f685c90d7952d1694 (diff) | |
| download | nextcloud-server-7b150dfa963d81889b8d40bf3956795c9a712aec.tar.gz nextcloud-server-7b150dfa963d81889b8d40bf3956795c9a712aec.zip | |
merge master into filesystem
Diffstat (limited to 'lib/app.php')
| -rwxr-xr-x | lib/app.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/app.php b/lib/app.php index 03f4a1316bd..393eac87911 100755 --- a/lib/app.php +++ b/lib/app.php @@ -549,17 +549,14 @@ class OC_App{ foreach ( OC::$APPSROOTS as $apps_dir ) { if(! is_readable($apps_dir['path'])) { - OC_Log::write('core', 'unable to read app folder : ' .$apps_dir['path'] , OC_Log::WARN); + OC_Log::write('core', 'unable to read app folder : ' .$apps_dir['path'], OC_Log::WARN); continue; } $dh = opendir( $apps_dir['path'] ); while( $file = readdir( $dh ) ) { - if ( - $file[0] != '.' - and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php' ) - ) { + if ($file[0] != '.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')) { $apps[] = $file; |