diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-02-20 15:21:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-20 15:21:39 +0300 |
| commit | 82625e2a45e4ad136071d064ed33232773084d11 (patch) | |
| tree | 18c11e252c8e67bb477870d48f7ce64c9f77a328 | |
| parent | 7f49a2cb63d979932890dd9fb296e9b8f27405cd (diff) | |
| parent | 08688af2751a966c3e3bdf811c6eb97247fe435e (diff) | |
Merge pull request #14178 from nextcloud/bugfix/noid/get-current-user-for-guest-pages
Fix OC.getCurrentUser() on guest pages
| -rw-r--r-- | core/templates/layout.guest.php | 6 | ||||
| -rw-r--r-- | lib/private/TemplateLayout.php | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 39c7f83a3ca..608ce03186c 100644 --- 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 index e4a2724de67..74578afe861 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -122,6 +122,10 @@ class TemplateLayout extends \OC_Template { 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 ); |