From bae8ed235644b604e22f71cc8a3cfe6591e76149 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 27 Jun 2015 02:19:46 +0200 Subject: [PATCH] uniformize code --- htdocs/core/lib/security2.lib.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php index fe0c9809296..04e0fb133f6 100644 --- a/htdocs/core/lib/security2.lib.php +++ b/htdocs/core/lib/security2.lib.php @@ -212,7 +212,7 @@ function dol_loginfunction($langs,$conf,$mysoc) // Execute hook getLoginPageOptions // Should be an array with differents options in $hookmanager->resArray $parameters=array('entity' => GETPOST('entity','int')); - $hookmanager->executeHooks('getLoginPageOptions',$parameters); // Note that $action and $object may have been modified by some hooks + $reshook = $hookmanager->executeHooks('getLoginPageOptions',$parameters); // Note that $action and $object may have been modified by some hooks. resArray is filled by hook. // Login $login = (! empty($hookmanager->resArray['username']) ? $hookmanager->resArray['username'] : (GETPOST("username","alpha") ? GETPOST("username","alpha") : $demologin)); @@ -238,7 +238,6 @@ function dol_loginfunction($langs,$conf,$mysoc) elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png')) { $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png'; - } // Security graphical code