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/private/files/cache | |
| 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/private/files/cache')
| -rw-r--r-- | lib/private/files/cache/cache.php | 4 | ||||
| -rw-r--r-- | lib/private/files/cache/watcher.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php index e857d451881..6aab2173da7 100644 --- a/lib/private/files/cache/cache.php +++ b/lib/private/files/cache/cache.php @@ -109,7 +109,7 @@ class Cache { * get the stored metadata of a file or folder * * @param string/int $file - * @return array | false + * @return array|false */ public function get($file) { if (is_string($file) or $file == '') { @@ -597,7 +597,7 @@ class Cache { * get the path of a file on this storage by it's id * * @param int $id - * @return string | null + * @return string|null */ public function getPathById($id) { $sql = 'SELECT `path` FROM `*PREFIX*filecache` WHERE `fileid` = ? AND `storage` = ?'; diff --git a/lib/private/files/cache/watcher.php b/lib/private/files/cache/watcher.php index 48aa6f853ce..599752a6eff 100644 --- a/lib/private/files/cache/watcher.php +++ b/lib/private/files/cache/watcher.php @@ -55,7 +55,7 @@ class Watcher { * check $path for updates * * @param string $path - * @return boolean | array true if path was updated, otherwise the cached data is returned + * @return boolean|array true if path was updated, otherwise the cached data is returned */ public function checkUpdate($path) { if ($this->watchPolicy === self::CHECK_ALWAYS or ($this->watchPolicy === self::CHECK_ONCE and array_search($path, $this->checkedPaths) === false)) { |