Skip to content

Commit

Permalink
Merge pull request #2238 from splitbrain/removeDeprecatedMethodCalls
Browse files Browse the repository at this point in the history
remove deprecated method call from html_login
  • Loading branch information
splitbrain committed Jan 24, 2018
2 parents a409094 + d1d904b commit 606ef46
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions inc/html.php
Expand Up @@ -36,8 +36,10 @@ function html_wikilink($id,$name=null,$search=''){
* The loginform
*
* @author Andreas Gohr <andi@splitbrain.org>
*
* @param bool $svg Whether to show svg icons in the register and resendpwd links or not
*/
function html_login(){
function html_login($svg = false){
global $lang;
global $conf;
global $ID;
Expand All @@ -58,11 +60,13 @@ function html_login(){
$form->endFieldset();

if(actionOK('register')){
$form->addElement('<p>'.$lang['reghere'].': '.tpl_actionlink('register','','','',true).'</p>');
$registerLink = (new \dokuwiki\Menu\Item\Register())->asHtmlLink('', $svg);
$form->addElement('<p>'.$lang['reghere'].': '. $registerLink .'</p>');
}

if (actionOK('resendpwd')) {
$form->addElement('<p>'.$lang['pwdforget'].': '.tpl_actionlink('resendpwd','','','',true).'</p>');
$resendPwLink = (new \dokuwiki\Menu\Item\Resendpwd())->asHtmlLink('', $svg);
$form->addElement('<p>'.$lang['pwdforget'].': '. $resendPwLink .'</p>');
}

html_form('login', $form);
Expand Down

0 comments on commit 606ef46

Please sign in to comment.