Fix OC.getCurrentUser() on guest pages

nickvergessen · nickvergessen · commit 08688af2751a · 2019-02-19T16:08:40.000+01:00
Signed-off-by: Joas Schilling &lt;coding@schilljs.com&gt;
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
@@ -1,6 +1,10 @@
 <!DOCTYPE html>
 <html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" data-locale="<?php p($_['locale']); ?>" >
-	<head data-requesttoken="<?php p($_['requesttoken']); ?>">
+	<head
+<?php if ($_['user_uid']) { ?>
+	data-user="<?php p($_['user_uid']); ?>" data-user-displayname="<?php p($_['user_displayname']); ?>"
+<?php } ?>
+ data-requesttoken="<?php p($_['requesttoken']); ?>">
 		<meta charset="utf-8">
 		<title>
 		<?php p($theme->getTitle()); ?>
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
@@ -122,6 +122,10 @@ public function __construct( $renderAs, $appId = '' ) {
 			parent::__construct('core', 'layout.guest');
 			\OC_Util::addStyle('guest');
 			$this->assign('bodyid', 'body-login');
+
+			$userDisplayName = \OC_User::getDisplayName();
+			$this->assign('user_displayname', $userDisplayName);
+			$this->assign('user_uid', \OC_User::getUser());
 		} else if ($renderAs == 'public') {
 			parent::__construct('core', 'layout.public');
 			$this->assign( 'appid', $appId );
