diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-12 14:48:56 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-12 14:49:41 -0400 |
| commit | 64ef1e21819979d7fdc406d2628bc175b16fe554 (patch) | |
| tree | d0f989440be3e39b6d286ce4992d2213fcb54d90 | |
| parent | fb493c45dd4ecadeaa5b1b112a156054318af0a2 (diff) | |
| download | nextcloud-server-64ef1e21819979d7fdc406d2628bc175b16fe554.tar.gz nextcloud-server-64ef1e21819979d7fdc406d2628bc175b16fe554.zip | |
Change name of share function to shareItem, silly PHP 5.3.1 thinking it is a constructor...
| -rw-r--r-- | core/ajax/share.php | 2 | ||||
| -rw-r--r-- | lib/public/share.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php index 625199aa0b6..3eadff431ca 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -26,7 +26,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item'] case 'share': if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) { try { - OCP\Share::share($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']); + OCP\Share::shareItem($_POST['itemType'], $_POST['item'], $_POST['shareType'], $_POST['shareWith'], $_POST['permissions']); // TODO May need to return private link OC_JSON::success(); } catch (Exception $exception) { diff --git a/lib/public/share.php b/lib/public/share.php index bda2441b45e..cead8396a43 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -140,7 +140,7 @@ class Share { * @param int CRUDS permissions * @return bool Returns true on success or false on failure */ - public static function share($itemType, $itemSource, $shareType, $shareWith, $permissions) { + public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions) { $uidOwner = \OC_User::getUser(); // Verify share type and sharing conditions are met switch ($shareType) { @@ -201,7 +201,7 @@ class Share { \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); throw new \Exception($message); } - return self::share($itemType, $itemSource, self::SHARE_TYPE_EMAIL, $details['EMAIL'], $permissions); + return self::shareItem($itemType, $itemSource, self::SHARE_TYPE_EMAIL, $details['EMAIL'], $permissions); break; // Future share types need to include their own conditions default: |