From 43d82213403852660a4880956b96fa867ef729ed Mon Sep 17 00:00:00 2001 From: Cameron Date: Sat, 2 May 2020 11:39:03 -0700 Subject: [PATCH] Fixes #4080 - user profile date issue. --- e107_core/shortcodes/batch/user_shortcodes.php | 2 +- e107_handlers/date_handler.php | 4 +--- e107_handlers/e_signup_class.php | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/e107_core/shortcodes/batch/user_shortcodes.php b/e107_core/shortcodes/batch/user_shortcodes.php index 5dc1a8fcb..106a4a439 100644 --- a/e107_core/shortcodes/batch/user_shortcodes.php +++ b/e107_core/shortcodes/batch/user_shortcodes.php @@ -185,7 +185,7 @@ class user_shortcodes extends e_shortcode function sc_user_lastvisit_lapse($parm='') { - return $this->var['user_currentvisit'] ? "( ".e107::getDate()->computeLapse($this->var['user_currentvisit'])." ".LAN_USER_34." )" : ''; + return $this->var['user_currentvisit'] ? e107::getDate()->computeLapse($this->var['user_currentvisit']) : ''; } diff --git a/e107_handlers/date_handler.php b/e107_handlers/date_handler.php index ea47fe9f5..bfda9a64c 100644 --- a/e107_handlers/date_handler.php +++ b/e107_handlers/date_handler.php @@ -650,14 +650,12 @@ class e_date if($format === 'short') { break; } } - - if(strpos($ret[0],$secs) !== false) + if(strpos($ret[0],$sec) !== false) { $justNow = deftrue('LANDT_10',"Just now"); return $mode ? array($justNow) : $justNow; } - if($older_date < $newer_date) // past { diff --git a/e107_handlers/e_signup_class.php b/e107_handlers/e_signup_class.php index 8cbaf0755..b7de01de1 100644 --- a/e107_handlers/e_signup_class.php +++ b/e107_handlers/e_signup_class.php @@ -408,7 +408,7 @@ class e_signup_class e107::getEvent()->trigger('user_signup_activated', $row); e107::getEvent()->trigger('userfull', $row); // 'New' event - if (!empty($this->pref['autologinpostsignup'])) + if (!empty($this->pref['autologinpostsignup']) && !e107::isCli()) { require_once(e_HANDLER.'login.php'); $usr = new userlogin();