diff options
author | Tom Needham <needham.thomas@gmail.com> | 2012-12-14 15:15:05 +0000 |
---|---|---|
committer | Tom Needham <needham.thomas@gmail.com> | 2012-12-14 15:15:05 +0000 |
commit | 5fe61296981343a3f877618aeecfc33ea7fed3c1 (patch) | |
tree | 919ea533c8d98f71f7c77d534eb0595207d22a17 /apps/files_sharing/appinfo | |
parent | 4facd766e3712d4c714f2e1bf2ad4be41461a7cc (diff) | |
parent | f0893fb8fe7f0642ae30de2e1168472377c127e2 (diff) | |
download | nextcloud-server-5fe61296981343a3f877618aeecfc33ea7fed3c1.tar.gz nextcloud-server-5fe61296981343a3f877618aeecfc33ea7fed3c1.zip |
Merge master into ocs_api, fix conflicts.
Diffstat (limited to 'apps/files_sharing/appinfo')
-rw-r--r-- | apps/files_sharing/appinfo/update.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php index e75c538b150..e998626f4a4 100644 --- a/apps/files_sharing/appinfo/update.php +++ b/apps/files_sharing/appinfo/update.php @@ -19,11 +19,11 @@ if (version_compare($installedVersion, '0.3', '<')) { $itemType = 'file'; } if ($row['permissions'] == 0) { - $permissions = OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE; + $permissions = OCP\PERMISSION_READ | OCP\PERMISSION_SHARE; } else { - $permissions = OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_SHARE; + $permissions = OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE | OCP\PERMISSION_SHARE; if ($itemType == 'folder') { - $permissions |= OCP\Share::PERMISSION_CREATE; + $permissions |= OCP\PERMISSION_CREATE; } } $pos = strrpos($row['uid_shared_with'], '@'); |