diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-19 22:29:01 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-19 22:29:01 -0400 |
| commit | 82d81e8d39ce69211ec6b29fe3f803c57714b8dd (patch) | |
| tree | 09dbd675480a02fd626f6634e083f3d6a01b4404 /lib/filecache.php | |
| parent | f893d21660695d1d1cd594c102e2bcba6919dee3 (diff) | |
| parent | 5eca531f99f9615d1a09bbb0b03dda2063901aa7 (diff) | |
| download | nextcloud-server-82d81e8d39ce69211ec6b29fe3f803c57714b8dd.tar.gz nextcloud-server-82d81e8d39ce69211ec6b29fe3f803c57714b8dd.zip | |
Merge branch 'share_api'
Conflicts:
apps/contacts/lib/vcard.php
apps/files/index.php
lib/files.php
Diffstat (limited to 'lib/filecache.php')
| -rw-r--r-- | lib/filecache.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/filecache.php b/lib/filecache.php index e8b17e254e1..352fc695f30 100644 --- a/lib/filecache.php +++ b/lib/filecache.php @@ -358,6 +358,10 @@ class OC_FileCache{ $eventSource->send('scanning',array('file'=>$path,'count'=>$count)); } $lastSend=$count; + // NOTE: Ugly hack to prevent shared files from going into the cache (the source already exists somewhere in the cache) + if (substr($path, 0, 7) == '/Shared') { + return; + } if($root===false){ $view=OC_Filesystem::getView(); }else{ @@ -395,6 +399,10 @@ class OC_FileCache{ * @return int size of the scanned file */ public static function scanFile($path,$root=false){ + // NOTE: Ugly hack to prevent shared files from going into the cache (the source already exists somewhere in the cache) + if (substr($path, 0, 7) == '/Shared') { + return; + } if($root===false){ $view=OC_Filesystem::getView(); }else{ |