[Pkg-owncloud-commits] [owncloud] 22/42: Merge pull request #6869 from owncloud/fix-setupfs-only-for-existing-users-stable6

[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 c430fe6612b2e1935c3395f0b8105781654399ef
Merge: 3501007 b722ce6
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Tue Jan 21 10:18:29 2014 -0800

    Merge pull request #6869 from owncloud/fix-setupfs-only-for-existing-users-stable6
    
    Fix setupfs only for existing users stable6

 apps/files/ajax/upload.php                |  1 +
 apps/files/triggerupdate.php              |  1 +
 apps/files_sharing/ajax/publicpreview.php |  3 ++-
 apps/files_sharing/appinfo/update.php     |  1 +
 apps/files_sharing/public.php             |  6 +++---
 lib/private/json.php                      | 14 ++++++++++++++
 lib/private/util.php                      |  4 ++++
 lib/public/json.php                       | 10 +++++++++-
 8 files changed, 35 insertions(+), 5 deletions(-)

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