]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #8607 from owncloud/filescan_app_hook
authorOwen Winkler <a_github@midnightcircus.com>
Fri, 30 May 2014 16:38:37 +0000 (12:38 -0400)
committerOwen Winkler <a_github@midnightcircus.com>
Fri, 30 May 2014 16:38:37 +0000 (12:38 -0400)
Allow apps to control via a hook skipping add/remove a file during filescan

1  2 
config/config.sample.php
lib/private/files/cache/scanner.php

Simple merge
index 61b22ea75a0b072f9a64ed919ed6922a946e369d,6dceaf13ec31f24c501923a984addae8364dee02..b97070fcdf0b910e514cffba8192b2b41e6a7cb7
@@@ -41,8 -42,13 +42,13 @@@ class Scanner extends BasicEmitter 
        /**
         * @var \OC\Files\Cache\Permissions $permissionsCache
         */
 -      private $permissionsCache;
 +      protected $permissionsCache;
  
+       /**
+        * @var boolean $cacheActive If true, perform cache operations, if false, do not affect cache
+        */
+       protected $cacheActive;
        const SCAN_RECURSIVE = true;
        const SCAN_SHALLOW = false;