summaryrefslogtreecommitdiffstats
path: root/files
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-02-05 01:23:04 +0100
committerRobin Appelman <icewind@owncloud.com>2012-02-05 01:23:04 +0100
commit7c00aedc37cf039ec23c54429d5188ab7d219b7e (patch)
treef8de99dce0dbfb0ea99e08f758ddea12b004dfce /files
parent36bc1a210233ed66ddbc6d5c3b4588b22d24d181 (diff)
downloadnextcloud-server-7c00aedc37cf039ec23c54429d5188ab7d219b7e.tar.gz
nextcloud-server-7c00aedc37cf039ec23c54429d5188ab7d219b7e.zip
some improvements in file scanning
Diffstat (limited to 'files')
-rw-r--r--files/ajax/scan.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/files/ajax/scan.php b/files/ajax/scan.php
index f7e75d5f8ba..565275911b4 100644
--- a/files/ajax/scan.php
+++ b/files/ajax/scan.php
@@ -15,13 +15,19 @@ if(!$checkOnly){
//create the file cache if necesary
if($force or !OC_FileCache::inCache('')){
if(!$checkOnly){
- OC_FileCache::scan('',false,$eventSource);
+ OC_DB::beginTransaction();
+ OC_FileCache::scan('',$eventSource);
+ OC_DB::commit();
$eventSource->send('success',true);
}else{
OC_JSON::success(array('data'=>array('done'=>true)));
exit;
}
}else{
+ if($checkOnly){
+ OC_JSON::success(array('data'=>array('done'=>false)));
+ exit;
+ }
if(isset($eventSource)){
$eventSource->send('success',false);
}else{