From b470869114f7b6d7550fd8a32f82ea4fb6e361e7 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 10 Jul 2012 14:42:15 +0200 Subject: [PATCH] when checking for updates in the filecache, explicitly state that we are querying a folder --- lib/filecache.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/filecache.php b/lib/filecache.php index a0ad2be4f7..57c6f1915c 100644 --- a/lib/filecache.php +++ b/lib/filecache.php @@ -256,7 +256,7 @@ class OC_FileCache{ * - versioned */ public static function getFolderContent($path,$root='',$mimetype_filter=''){ - if(self::isUpdated($path,$root)){ + if(self::isUpdated($path,$root,true)){ self::updateFolder($path,$root); } if(!$root){ @@ -633,9 +633,10 @@ class OC_FileCache{ * check if a file or folder is updated outside owncloud * @param string path * @param string root (optional) + * @param bool folder (optional) * @return bool */ - public static function isUpdated($path,$root=''){ + public static function isUpdated($path,$root='',$folder=false){ if(!$root){ $root=OC_Filesystem::getRoot(); $view=OC_Filesystem::getView(); @@ -648,7 +649,7 @@ class OC_FileCache{ if(!$view->file_exists($path)){ return false; } - $mtime=$view->filemtime($path); + $mtime=$view->filemtime($path.(($folder)?'/':'')); $isDir=$view->is_dir($path); $fullPath=$root.$path; $query=OC_DB::prepare('SELECT mtime FROM *PREFIX*fscache WHERE path_hash=?');