Fix "Undefined index: user_uid" on login page
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
parent
7c68e0eae7
commit
071b686543
|
@ -67,7 +67,7 @@ class TemplateLayout extends \OC_Template {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Decide which page we show
|
// Decide which page we show
|
||||||
if($renderAs == 'user') {
|
if($renderAs === 'user') {
|
||||||
parent::__construct( 'core', 'layout.user' );
|
parent::__construct( 'core', 'layout.user' );
|
||||||
if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
|
if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
|
||||||
$this->assign('bodyid', 'body-settings');
|
$this->assign('bodyid', 'body-settings');
|
||||||
|
@ -115,10 +115,12 @@ class TemplateLayout extends \OC_Template {
|
||||||
$this->assign('themingInvertMenu', false);
|
$this->assign('themingInvertMenu', false);
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if ($renderAs == 'error') {
|
} else if ($renderAs === 'error') {
|
||||||
parent::__construct('core', 'layout.guest', '', false);
|
parent::__construct('core', 'layout.guest', '', false);
|
||||||
$this->assign('bodyid', 'body-login');
|
$this->assign('bodyid', 'body-login');
|
||||||
} else if ($renderAs == 'guest') {
|
$this->assign('user_displayname', '');
|
||||||
|
$this->assign('user_uid', '');
|
||||||
|
} else if ($renderAs === 'guest') {
|
||||||
parent::__construct('core', 'layout.guest');
|
parent::__construct('core', 'layout.guest');
|
||||||
\OC_Util::addStyle('guest');
|
\OC_Util::addStyle('guest');
|
||||||
$this->assign('bodyid', 'body-login');
|
$this->assign('bodyid', 'body-login');
|
||||||
|
@ -126,7 +128,7 @@ class TemplateLayout extends \OC_Template {
|
||||||
$userDisplayName = \OC_User::getDisplayName();
|
$userDisplayName = \OC_User::getDisplayName();
|
||||||
$this->assign('user_displayname', $userDisplayName);
|
$this->assign('user_displayname', $userDisplayName);
|
||||||
$this->assign('user_uid', \OC_User::getUser());
|
$this->assign('user_uid', \OC_User::getUser());
|
||||||
} else if ($renderAs == 'public') {
|
} else if ($renderAs === 'public') {
|
||||||
parent::__construct('core', 'layout.public');
|
parent::__construct('core', 'layout.public');
|
||||||
$this->assign( 'appid', $appId );
|
$this->assign( 'appid', $appId );
|
||||||
$this->assign('bodyid', 'body-public');
|
$this->assign('bodyid', 'body-public');
|
||||||
|
|
Loading…
Reference in New Issue