Browse Source
Fix OC.getCurrentUser() on guest pages
Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/14178/head
Joas Schilling
7 years ago
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
2 changed files with
9 additions and
1 deletions
-
core/templates/layout.guest.php
-
lib/private/TemplateLayout.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()); ?>
|
|
|
|
|
|
|
|
@ -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 ); |
|
|
|
|
