mirror of
https://github.com/lkddi/nexusphp.git
synced 2026-04-24 12:07:23 +08:00
fix carbon 3 diffIn*
This commit is contained in:
@@ -68,7 +68,7 @@ foreach ($period as $value) {
|
||||
if ($logValue->is_retroactive) {
|
||||
$events[] = array_merge($eventBase, ['title' => $lang_attendance['retroactive_event_text'], 'display' => 'list-item']);
|
||||
}
|
||||
} elseif ($value->lte($today) && $value->diffInDays($today) <= \App\Models\Attendance::MAX_RETROACTIVE_DAYS) {
|
||||
} elseif ($value->lte($today) && $value->diffInDays($today, true) <= \App\Models\Attendance::MAX_RETROACTIVE_DAYS) {
|
||||
$events[] = array_merge($eventBase, ['groupId' => 'to_do', 'display' => 'list-item']);
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -73,7 +73,7 @@ foreach ($list as $row) {
|
||||
<td class='rowfollow' align='left'><a href='userdetails.php?id=" . $row->uid . "'>" . $row->user->username . "</a></td>
|
||||
<td class='rowfollow' align='left'><a href='details.php?id=" . $row->torrent_id . "'>" . $row->torrent->name . "</a></td>
|
||||
<td class='rowfollow nowrap' align='center'>" . mksize($row->torrent->size) . "</td>
|
||||
<td class='rowfollow nowrap' align='center'>" . mkprettytime($row->torrent->added->diffInSeconds($now)) . "</td>
|
||||
<td class='rowfollow nowrap' align='center'>" . mkprettytime($row->torrent->added->diffInSeconds($now, true)) . "</td>
|
||||
<td class='rowfollow nowrap' align='center'>" . format_datetime($row->created_at) . "</td>
|
||||
<td class='rowfollow nowrap' align='center'>" . format_datetime($row->last_settle_at) . "</td>
|
||||
<td class='rowfollow nowrap' align='center'>" . mkprettytime($row->snatch->seedtime - $row->seed_time_begin) . "</td>
|
||||
|
||||
@@ -30,7 +30,7 @@ $userRep = new \App\Repositories\UserRepository();
|
||||
if ($user['added'] == "0000-00-00 00:00:00" || $user['added'] == null) {
|
||||
$joindate = $lang_userdetails['text_not_available'];
|
||||
} else {
|
||||
$weeks = $userInfo->added->diffInWeeks() . nexus_trans('nexus.time_units.week');
|
||||
$weeks = abs($userInfo->added->diffInWeeks()) . nexus_trans('nexus.time_units.week');
|
||||
$joindate = $user['added']." (" . gettime($user["added"], true, false, true).", $weeks)";
|
||||
}
|
||||
$lastseen = $user["last_access"];
|
||||
|
||||
Reference in New Issue
Block a user