From b03611922f22298ea07d87c3d3870646a30186cf Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 21 Feb 2019 12:05:54 -0800 Subject: [PATCH] Global fix and PHP Doc fix. --- e107_core/templates/signup_template.php | 2 +- e107_handlers/user_handler.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/e107_core/templates/signup_template.php b/e107_core/templates/signup_template.php index 9247a65a9..751bcecb1 100755 --- a/e107_core/templates/signup_template.php +++ b/e107_core/templates/signup_template.php @@ -192,7 +192,7 @@ if(!defined($COPPA_TEMPLATE)) { $COPPA_TEMPLATE = LAN_SIGNUP_77." ".LAN_SIGNUP_14.". " - .LAN_SIGNUP_15." ".$tp->emailObfuscate(SITEADMINEMAIL,LAN_SIGNUP_14)." ".LAN_SIGNUP_16."
+ .LAN_SIGNUP_15." ".e107::getParser()->emailObfuscate(SITEADMINEMAIL,LAN_SIGNUP_14)." ".LAN_SIGNUP_16."

".LAN_SIGNUP_17." {SIGNUP_COPPA_FORM} diff --git a/e107_handlers/user_handler.php b/e107_handlers/user_handler.php index 6302b0004..4c542f402 100644 --- a/e107_handlers/user_handler.php +++ b/e107_handlers/user_handler.php @@ -345,7 +345,7 @@ class UserHandler * Detect Password Hash Algorythm type * @param string $hash - Password hash to analyse * @param string $mode - (optional) set to 'text' for a plain-text description. - * @return bool|int + * @return bool|int|array */ public function getHashType($hash, $mode='constant') { @@ -1333,7 +1333,8 @@ class e_user_provider $userdata['user_perms'] = ''; $userdata['user_realm'] = ''; $userdata['user_pwchange'] = $now; - + + /** @var e_system_user' $user */ $user = e107::getSystemUser(0, false); $user->setData($userdata); $user->getExtendedModel(); // init