Commit f29ebbc1 authored by Alan McNatty's avatar Alan McNatty Committed by Gerrit Code Review
Browse files

Merge "Do not display empty extra login container (bug #1023791)"

parents a0e55b37 a1534b23
......@@ -1078,14 +1078,15 @@ function auth_get_login_form() {
);
$extraelements = array_merge(array('label' => $loginlabel), $extraelements);
}
$extraelements = array(
'login_extra' => array(
'type' => 'container',
'class' => 'login_extra',
'elements' => $extraelements
)
);
if (count($extraelements)) {
$extraelements = array(
'login_extra' => array(
'type' => 'container',
'class' => 'login_extra',
'elements' => $extraelements
)
);
}
// Replace or supplement the standard login form elements
if ($showbasicform) {
$elements = array_merge($elements, $extraelements);
......@@ -1825,14 +1826,15 @@ function auth_generate_login_form() {
);
$extraelements = array_merge(array('label' => $loginlabel), $extraelements);
}
$extraelements = array(
'login_extra' => array(
'type' => 'container',
'class' => 'login_extra',
'elements' => $extraelements
)
);
if (count($extraelements)) {
$extraelements = array(
'login_extra' => array(
'type' => 'container',
'class' => 'login_extra',
'elements' => $extraelements
)
);
}
// Replace or supplement the standard login form elements
if ($showbasicform) {
$elements = array_merge($elements, $extraelements);
......
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