[Pkg-owncloud-commits] [owncloud] 80/145: Only add files to file list when uploading to current directory

[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 48bb8aeb017b0d9b04e40d589a8bd93267b186e7
Author: Joas Schilling <nickvergessen at gmx.de>
Date:   Fri Feb 7 12:53:42 2014 +0100

    Only add files to file list when uploading to current directory
    
    Fix Issue #6683
---
 apps/files/ajax/upload.php | 6 ++++--
 apps/files/js/filelist.js  | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index bdaf6a7..c45355c 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -137,7 +137,8 @@ if (strpos($dir, '..') === false) {
 							'originalname' => $files['tmp_name'][$i],
 							'uploadMaxFilesize' => $maxUploadFileSize,
 							'maxHumanFilesize' => $maxHumanFileSize,
-							'permissions' => $meta['permissions'] & $allowedPermissions
+							'permissions' => $meta['permissions'] & $allowedPermissions,
+							'directory' => \OC\Files\Filesystem::normalizePath(stripslashes($dir)),
 						);
 					}
 
@@ -164,7 +165,8 @@ if (strpos($dir, '..') === false) {
 					'originalname' => $files['tmp_name'][$i],
 					'uploadMaxFilesize' => $maxUploadFileSize,
 					'maxHumanFilesize' => $maxHumanFileSize,
-					'permissions' => $meta['permissions'] & $allowedPermissions
+					'permissions' => $meta['permissions'] & $allowedPermissions,
+					'directory' => \OC\Files\Filesystem::normalizePath(stripslashes($dir)),
 				);
 			}
 		}
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 66968ab..086810c 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -895,8 +895,8 @@ $(document).ready(function() {
 				data.context.find('td.filesize').text(humanFileSize(size));
 
 			} else {
-				// only append new file if dragged onto current dir's crumb (last)
-				if (data.context && data.context.hasClass('crumb') && !data.context.hasClass('last')) {
+				// only append new file if uploaded into the current folder
+				if (file.directory !== FileList.getCurrentDirectory()) {
 					return;
 				}
 

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