[Pkg-owncloud-commits] [owncloud] 181/199: Merge pull request #8607 from owncloud/filescan_app_hook

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit da6aae28ad0cb1bad3d0693f126a5436af64240d
Merge: b7f163a 19f0c47
Author: Owen Winkler <a_github at midnightcircus.com>
Date:   Fri May 30 12:38:37 2014 -0400

    Merge pull request #8607 from owncloud/filescan_app_hook
    
    Allow apps to control via a hook skipping add/remove a file during filescan

 config/config.sample.php            |  5 +++-
 lib/private/files/cache/scanner.php | 50 +++++++++++++++++++++++++++++++------
 2 files changed, 46 insertions(+), 9 deletions(-)

diff --cc lib/private/files/cache/scanner.php
index 61b22ea,6dceaf1..b97070f
--- a/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@@ -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;
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git