Completed
Pull Request — master (#24189)
by Christoph
29:07
created
lib/private/user/session.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 	/**
163 163
 	 * get the current active user
164 164
 	 *
165
-	 * @return IUser|null Current user, otherwise null
165
+	 * @return null|User Current user, otherwise null
166 166
 	 */
167 167
 	public function getUser() {
168 168
 		// FIXME: This is a quick'n dirty work-around for the incognito mode as
@@ -277,6 +277,9 @@  discard block
 block discarded – undo
277 277
 		}
278 278
 	}
279 279
 
280
+	/**
281
+	 * @param string $uid
282
+	 */
280 283
 	private function loginWithToken($uid) {
281 284
 		$this->session->regenerateId();
282 285
 		//$this->manager->emit('\OC\User', 'preTokenLogin', array($uid));
Please login to merge, or discard this patch.
core/Controller/LoginController.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,6 @@
 block discarded – undo
26 26
 use OC;
27 27
 use OC\User\Session;
28 28
 use OC_App;
29
-use OC_User;
30 29
 use OC_Util;
31 30
 use OCP\AppFramework\Controller;
32 31
 use OCP\AppFramework\Http\RedirectResponse;
Please login to merge, or discard this patch.