From 1885d41460ca80b3c2cca0d0d5cc6dc24e8a7e81 Mon Sep 17 00:00:00 2001
From: Scott Shambarger <devel@shambarger.net>
Date: Mon, 4 May 2020 14:00:29 -0700
Subject: [PATCH] Revert 581d3007f

---
 lib/private/User/Session.php  | 14 ++++----------
 lib/private/legacy/OC_App.php |  3 +--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index 9fec8eb08b..817dcbf4c3 100644
--- a/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@ -223,10 +223,9 @@ class Session implements IUserSession, Emitter {
 	/**
 	 * get the current active user
 	 *
-	 * @param bool $validate whether to validate session
 	 * @return IUser|null Current user, otherwise null
 	 */
-	public function getUser($validate = true) {
+	public function getUser() {
 		// FIXME: This is a quick'n dirty work-around for the incognito mode as
 		// described at https://github.com/owncloud/core/pull/12912#issuecomment-67391155
 		if (OC_User::isIncognitoMode()) {
@@ -237,16 +236,11 @@ class Session implements IUserSession, Emitter {
 			if (is_null($uid)) {
 				return null;
 			}
-			// UserManager will cache user for later validation...
-			$user = $this->manager->get($uid);
-			if (is_null($user)) {
+			$this->activeUser = $this->manager->get($uid);
+			if (is_null($this->activeUser)) {
 				return null;
 			}
-			if ($validate === true) {
-				// only set activeUser when validating...
-				$this->activeUser = $user;
-				$this->validateSession();
-			}
+			$this->validateSession();
 		}
 		return $this->activeUser;
 	}
diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php
index 337ccda3a4..2454d6be4f 100644
--- a/lib/private/legacy/OC_App.php
+++ b/lib/private/legacy/OC_App.php
@@ -348,8 +348,7 @@ class OC_App {
 		if ($all) {
 			$user = null;
 		} else {
-			// getUser but don't validate session yet
-			$user = \OC::$server->getUserSession()->getUser(false);
+			$user = \OC::$server->getUserSession()->getUser();
 		}
 
 		if (is_null($user)) {