Loading patches/034-display-back-to-login +3 −3 Original line number Diff line number Diff line Loading @@ -32,7 +32,7 @@ index 2e5488ae8d..09fbc1e7c4 100644 + <?php endif; ?> </div> diff --git a/lib/private/legacy/OC_Template.php b/lib/private/legacy/OC_Template.php index 0c9fa1ccc0..d137c7f838 100644 index 0c9fa1ccc0..7f58c6d007 100644 --- a/lib/private/legacy/OC_Template.php +++ b/lib/private/legacy/OC_Template.php @@ -279,7 +279,7 @@ class OC_Template extends \OC\Template\Base { Loading @@ -44,13 +44,13 @@ index 0c9fa1ccc0..d137c7f838 100644 if (\OC::$server->getAppManager()->isEnabledForUser('theming') && !\OC_App::isAppLoaded('theming')) { \OC_App::loadApp('theming'); } @@ -293,8 +293,8 @@ class OC_Template extends \OC\Template\Base { @@ -293,8 +293,9 @@ class OC_Template extends \OC\Template\Base { http_response_code($statusCode); try { $content = new \OC_Template('', 'error', 'error', false); - $errors = [['error' => $error_msg, 'hint' => $hint]]; - $content->assign('errors', $errors); + $errors = [['error' => $error_msg, 'hint' => $hint, 'statusCode' => $statusCode]]; $content->assign('errors', $errors); + $content->assign('logout_url', $logoutUrl != null ? $logoutUrl : OC_User::getLogoutUrl(\OC::$server->getURLGenerator())); $content->printPage(); } catch (\Exception $e) { Loading Loading
patches/034-display-back-to-login +3 −3 Original line number Diff line number Diff line Loading @@ -32,7 +32,7 @@ index 2e5488ae8d..09fbc1e7c4 100644 + <?php endif; ?> </div> diff --git a/lib/private/legacy/OC_Template.php b/lib/private/legacy/OC_Template.php index 0c9fa1ccc0..d137c7f838 100644 index 0c9fa1ccc0..7f58c6d007 100644 --- a/lib/private/legacy/OC_Template.php +++ b/lib/private/legacy/OC_Template.php @@ -279,7 +279,7 @@ class OC_Template extends \OC\Template\Base { Loading @@ -44,13 +44,13 @@ index 0c9fa1ccc0..d137c7f838 100644 if (\OC::$server->getAppManager()->isEnabledForUser('theming') && !\OC_App::isAppLoaded('theming')) { \OC_App::loadApp('theming'); } @@ -293,8 +293,8 @@ class OC_Template extends \OC\Template\Base { @@ -293,8 +293,9 @@ class OC_Template extends \OC\Template\Base { http_response_code($statusCode); try { $content = new \OC_Template('', 'error', 'error', false); - $errors = [['error' => $error_msg, 'hint' => $hint]]; - $content->assign('errors', $errors); + $errors = [['error' => $error_msg, 'hint' => $hint, 'statusCode' => $statusCode]]; $content->assign('errors', $errors); + $content->assign('logout_url', $logoutUrl != null ? $logoutUrl : OC_User::getLogoutUrl(\OC::$server->getURLGenerator())); $content->printPage(); } catch (\Exception $e) { Loading