when checking for updates in the filecache, explicitly state that we are querying...

diff --git a/lib/filecache.php b/lib/filecache.php
index a0ad2be4f770f595819e33b9d9665dd92445cfa8..57c6f1915c9ee7b97f0068041dff050cd8a85fa0 100644 (file)
--- 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=?');