10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-20 15:13:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ultimatemember/ultimatemember

Browse Source 
# Conflicts:
#	assets/js/um-conditional.js
#	assets/js/um-conditional.min.js
#	assets/js/um-scripts.min.js
#	includes/core/class-enqueue.php
This commit is contained in:
Yurii Nalivaiko
2018-11-13 14:57:01 +02:00
parent 289a3a05d1 0d1a9f676b
commit 10d699333c
17 changed files with 788 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/um-short-functions.php
+3 -22
View File
@@ -981,19 +981,6 @@ function um_is_temp_file( $filename ) {
}
/**
* Get core page url
*
* @param $time1
* @param $time2
*
* @return mixed|void
*/
function um_time_diff( $time1, $time2 ) {
return UM()->datetime()->time_diff( $time1, $time2 );
}
/**
* Get user's last login timestamp
*
@@ -1013,19 +1000,13 @@ function um_user_last_login_timestamp( $user_id ) {
/**
* Get user's last login (time diff)
*
* @param $user_id
* @param int $user_id
*
* @return mixed|string|void
* @return string
*/
function um_user_last_login( $user_id ) {
$value = get_user_meta( $user_id, '_um_last_login', true );
if ( $value ) {
$value = um_time_diff( $value, current_time( 'timestamp' ) );
} else {
$value = '';
}
return $value;
return ! empty( $value ) ? UM()->datetime()->time_diff( $value, current_time( 'timestamp' ) ) : '';
}