mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-07 15:16:30 +02:00
Code Issues Releases Wiki Activity

Fixes #4080 - user profile date issue.

Browse Source
This commit is contained in:
Cameron
2020-05-02 11:39:03 -07:00
parent 76442d7272
commit 43d8221340
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_core/shortcodes/batch/user_shortcodes.php
View File

@@ -185,7 +185,7 @@ class user_shortcodes extends e_shortcode
function sc_user_lastvisit_lapse($parm='') 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']) : '';
} }

4
e107_handlers/date_handler.php
View File

@@ -650,14 +650,12 @@ class e_date
if($format === 'short') { break; } if($format === 'short') { break; }
} }
if(strpos($ret[0],$sec) !== false)
if(strpos($ret[0],$secs) !== false)
{ {
$justNow = deftrue('LANDT_10',"Just now"); $justNow = deftrue('LANDT_10',"Just now");
return $mode ? array($justNow) : $justNow; return $mode ? array($justNow) : $justNow;
} }
if($older_date < $newer_date) // past if($older_date < $newer_date) // past
{ {

2
e107_handlers/e_signup_class.php
View File

@@ -408,7 +408,7 @@ class e_signup_class
e107::getEvent()->trigger('user_signup_activated', $row); e107::getEvent()->trigger('user_signup_activated', $row);
e107::getEvent()->trigger('userfull', $row); // 'New' event 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'); require_once(e_HANDLER.'login.php');
$usr = new userlogin(); $usr = new userlogin();