diff options
| author | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-05-11 18:28:45 +0100 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-05-13 19:08:14 +0100 |
| commit | a7ae2e874a28aed2c190840634db50a19ab1d2e7 (patch) | |
| tree | 1e86370be647a8845bf2ac11c0287def1f3802db /lib/public | |
| parent | b5bc37d2e40aba0ab8d3e72e7f7075352839096d (diff) | |
| download | nextcloud-server-a7ae2e874a28aed2c190840634db50a19ab1d2e7.tar.gz nextcloud-server-a7ae2e874a28aed2c190840634db50a19ab1d2e7.zip | |
Squash 'a | b' into 'a|b', in /lib
Diffstat (limited to 'lib/public')
| -rw-r--r-- | lib/public/files/fileinfo.php | 2 | ||||
| -rw-r--r-- | lib/public/share.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/public/files/fileinfo.php b/lib/public/files/fileinfo.php index 37162e09336..bf0c31918cb 100644 --- a/lib/public/files/fileinfo.php +++ b/lib/public/files/fileinfo.php @@ -104,7 +104,7 @@ interface FileInfo { /** * Check whether this is a file or a folder * - * @return \OCP\Files\FileInfo::TYPE_FILE | \OCP\Files\FileInfo::TYPE_FOLDER + * @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER */ public function getType(); diff --git a/lib/public/share.php b/lib/public/share.php index b21b3a7b963..018386253bc 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -160,7 +160,7 @@ class Share extends \OC\Share\Constants { /** * Based on the given token the share information will be returned - password protected shares will be verified * @param string $token - * @return array | bool false will be returned in case the token is unknown or unauthorized + * @return array|bool false will be returned in case the token is unknown or unauthorized */ public static function getShareByToken($token, $checkPasswordProtection = true) { return \OC\Share\Share::getShareByToken($token, $checkPasswordProtection); |