diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-26 18:08:49 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-26 18:08:49 +0200 |
| commit | 2b10371bdeb2c8a3d5cc2617ada5cf8195c264c9 (patch) | |
| tree | f25b463c90992764887416c3082098fed6ecac65 /apps/files/ajax | |
| parent | 40f95ffdf3edf9ab45c15bd5b9018d7f4d92baa9 (diff) | |
| parent | 127796218314c6b1f19ba86f74caa913375aac8d (diff) | |
| download | nextcloud-server-2b10371bdeb2c8a3d5cc2617ada5cf8195c264c9.tar.gz nextcloud-server-2b10371bdeb2c8a3d5cc2617ada5cf8195c264c9.zip | |
fix merge conflicts
Diffstat (limited to 'apps/files/ajax')
| -rw-r--r-- | apps/files/ajax/scan.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php index 488f68e6b3c..a227dcc3ffc 100644 --- a/apps/files/ajax/scan.php +++ b/apps/files/ajax/scan.php @@ -3,6 +3,7 @@ set_time_limit(0);//scanning can take ages $force=isset($_GET['force']) and $_GET['force']=='true'; +$dir=isset($_GET['dir'])?$_GET['dir']:''; $checkOnly=isset($_GET['checkonly']) and $_GET['checkonly']=='true'; if(!$checkOnly){ @@ -14,7 +15,7 @@ if(!$checkOnly){ if($force or !OC_FileCache::inCache('')){ if(!$checkOnly){ OC_DB::beginTransaction(); - OC_FileCache::scan('',$eventSource); + OC_FileCache::scan($dir,$eventSource); OC_FileCache::clean(); OC_DB::commit(); $eventSource->send('success',true); |