diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/l10n/pt_PT.js | 1 | ||||
| -rw-r--r-- | lib/l10n/pt_PT.json | 1 | ||||
| -rw-r--r-- | lib/private/Lockdown/Filesystem/NullCache.php | 31 |
3 files changed, 19 insertions, 14 deletions
diff --git a/lib/l10n/pt_PT.js b/lib/l10n/pt_PT.js index 092db1edb8e..937cd4b983a 100644 --- a/lib/l10n/pt_PT.js +++ b/lib/l10n/pt_PT.js @@ -71,6 +71,7 @@ OC.L10N.register( "Apps" : "Apps", "Settings" : "Definições", "Log out" : "Sair", + "Accounts" : "Contas", "Email" : "E-mail", "Mail %s" : "Mensagem para %s", "Phone" : "Telefone", diff --git a/lib/l10n/pt_PT.json b/lib/l10n/pt_PT.json index 01f08729953..d8955a0796a 100644 --- a/lib/l10n/pt_PT.json +++ b/lib/l10n/pt_PT.json @@ -69,6 +69,7 @@ "Apps" : "Apps", "Settings" : "Definições", "Log out" : "Sair", + "Accounts" : "Contas", "Email" : "E-mail", "Mail %s" : "Mensagem para %s", "Phone" : "Telefone", diff --git a/lib/private/Lockdown/Filesystem/NullCache.php b/lib/private/Lockdown/Filesystem/NullCache.php index e84ff40e00c..fcd9e7f1340 100644 --- a/lib/private/Lockdown/Filesystem/NullCache.php +++ b/lib/private/Lockdown/Filesystem/NullCache.php @@ -21,20 +21,23 @@ class NullCache implements ICache { } public function get($file) { - return $file !== '' ? null : - new CacheEntry([ - 'fileid' => -1, - 'parent' => -1, - 'name' => '', - 'path' => '', - 'size' => '0', - 'mtime' => time(), - 'storage_mtime' => time(), - 'etag' => '', - 'mimetype' => FileInfo::MIMETYPE_FOLDER, - 'mimepart' => 'httpd', - 'permissions' => Constants::PERMISSION_READ - ]); + if ($file !== '') { + return false; + } + + return new CacheEntry([ + 'fileid' => -1, + 'parent' => -1, + 'name' => '', + 'path' => '', + 'size' => '0', + 'mtime' => time(), + 'storage_mtime' => time(), + 'etag' => '', + 'mimetype' => FileInfo::MIMETYPE_FOLDER, + 'mimepart' => 'httpd', + 'permissions' => Constants::PERMISSION_READ + ]); } public function getFolderContents($folder) { |