Commit cd4a1ef7 authored by Richard Mansfield's avatar Richard Mansfield

Stop double title and pagehelp appearing when redirecting to login form

parent 4cd8b17c
......@@ -815,7 +815,7 @@ function auth_draw_login_page($message=null, Pieform $form=null) {
if ($message) {
$SESSION->add_info_msg($message);
}
$smarty = smarty();
$smarty = smarty(array(), array(), array(), array('pagehelp' => false));
$smarty->assign('login_form', $loginform);
$smarty->assign('loginmessage', get_string('loginto', 'mahara', get_config('sitename')));
$smarty->display('login.tpl');
......
......@@ -360,7 +360,8 @@ EOF;
$smarty->assign_by_ref('JAVASCRIPT', $javascript_array);
$smarty->assign_by_ref('HEADERS', $headers);
if ($help = has_page_help()) {
if ((!isset($extraconfig['pagehelp']) || $extraconfig['pagehelp'] !== false)
and $help = has_page_help()) {
$smarty->assign('PAGEHELPNAME', $help[0]);
$smarty->assign('PAGEHELPICON', $help[1]);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment