From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 30 Mar 2015 08:43:37 +0000 (+0200)
Subject: fix parameter declaration and class initialisation
X-Git-Tag: v8.1.0alpha1~78^2~94
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2331298380690c9326b6d189c96e0201d6b0b9e1;p=nextcloud-server.git

fix parameter declaration and class initialisation
---

diff --git a/apps/encryption/appinfo/encryption.php b/apps/encryption/appinfo/encryption.php
index dd8004a4880..6aad9219025 100644
--- a/apps/encryption/appinfo/encryption.php
+++ b/apps/encryption/appinfo/encryption.php
@@ -85,7 +85,8 @@ class Encryption extends \OCP\AppFramework\App {
 					$container->query('UserSetup'),
 					$server->getUserSession(),
 					new \OCP\Util(),
-					$container->query('Util')),
+					$container->query('Util'),
+					$server->getSession()),
 			]);
 
 			$hookManager->fireHooks();
diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index 8c00077729e..3c93f759407 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -46,16 +46,16 @@ class Encryption implements IEncryptionModule {
 	/** @var boolean */
 	private $isWriteOperation;
 
-	/** @var \OC\Encryption\Util */
+	/** @var \OCA\Encryption\Util */
 	private $util;
 
 	/**
 	 *
 	 * @param \OCA\Encryption\Crypto\Crypt $crypt
 	 * @param KeyManager $keymanager
-	 * @param \OC\Encryption\Util $util
+	 * @param \OCA\Encryption\Util $util
 	 */
-	public function __construct(Crypt $crypt, KeyManager $keymanager, \OC\Encryption\Util $util) {
+	public function __construct(Crypt $crypt, KeyManager $keymanager, \OCA\Encryption\Util $util) {
 		$this->crypt = $crypt;
 		$this->keymanager = $keymanager;
 		$this->util = $util;