summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@owncloud.com>2014-05-19 14:08:42 +0200
committerAndreas Fischer <bantu@owncloud.com>2014-05-19 14:08:42 +0200
commit6c4b650524c4a8655984b89d4e7d105cfa61808c (patch)
tree705b7a235cc3780b902556b9af4b6625c6419e43 /apps/files
parent1cff73b61520462d3b22bdd85998eb0e48693ec5 (diff)
parente7aebc5c32c783f75a26f6ebc8116886a8cb55cf (diff)
downloadnextcloud-server-6c4b650524c4a8655984b89d4e7d105cfa61808c.tar.gz
nextcloud-server-6c4b650524c4a8655984b89d4e7d105cfa61808c.zip
Merge pull request #8585 from owncloud/phpdoc-improvements-apps
PHPDoc improvements /apps * owncloud/phpdoc-improvements-apps: Fix whitespace issues Reduce double-space with single-space. Remove spaces around | operator in doc block. Fix more missing or broken PHPDoc PHPDoc fixes for user_ldap Fix PHPDoc in /apps
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/index.php4
-rw-r--r--apps/files/lib/helper.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/files/index.php b/apps/files/index.php
index 9d4007d7f9e..e24c535cb20 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -68,8 +68,8 @@ $storageInfo=OC_Helper::getStorageInfo('/', $dirInfo);
// if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code)
$encryptionInitStatus = 2;
if (OC_App::isEnabled('files_encryption')) {
- $session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
- $encryptionInitStatus = $session->getInitialized();
+ $session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
+ $encryptionInitStatus = $session->getInitialized();
}
$nav = new OCP\Template('files', 'appnavigation', '');
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index 7e0f47bf84f..58d0886a636 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -167,7 +167,7 @@ class Helper
/**
* Sort the given file info array
*
- * @param \OCP\Files\FileInfo[] files to sort
+ * @param \OCP\Files\FileInfo[] $files files to sort
* @param string $sortAttribute attribute to sort on
* @param bool $sortDescending true for descending sort, false otherwise
* @return \OCP\Files\FileInfo[] sorted files