kazhnuz/koblog
1
0
Fork 0
Code Issues 30 Pull requests Projects 3 Releases Packages Wiki Activity Actions

Merge pull request #1572 from basteyy/patch-1

Browse source 
Fix 2 deprecated messages
This commit is contained in:
Diego Najar 2024-08-06 22:48:24 +02:00 • committed by GitHub
commit 16c70204dc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 39 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bl-kernel/pages.class.php
View file

@ -632,7 +632,7 @@ class Pages extends dbJSON
private function sortByPositionLowToHigh($a, $b) private function sortByPositionLowToHigh($a, $b)
{ {
return $a['position'] > $b['position']; return $a['position'] <=> $b['position'];
} }
private function sortByPositionHighToLow($a, $b) private function sortByPositionHighToLow($a, $b)
{ {

15
bl-kernel/pagex.class.php
View file

@ -548,13 +548,14 @@ class Page
$past = new DateTime($this->getValue('dateRaw')); $past = new DateTime($this->getValue('dateRaw'));
$elapsed = $current->diff($past); $elapsed = $current->diff($past);
$elapsed->w = floor($elapsed->d / 7); // Calculate weeks separately
$elapsed->d -= $elapsed->w * 7; $weeks = floor($elapsed->d / 7);
$elapsed->d -= $weeks * 7;
$string = array( $string = array(
'y' => 'year', 'y' => 'year',
'm' => 'month', 'm' => 'month',
'w' => 'week', 'w' => $weeks,
'd' => 'day', 'd' => 'day',
'h' => 'hour', 'h' => 'hour',
'i' => 'minute', 'i' => 'minute',
@ -562,7 +563,13 @@ class Page
); );
foreach ($string as $key => &$value) { foreach ($string as $key => &$value) {
if ($elapsed->$key) { if ($key == 'w') {
if ($weeks > 0) {
$value = $weeks . ' week' . ($weeks > 1 ? 's' : '');
} else {
unset($string[$key]);
}
} elseif ($elapsed->$key) {
$value = $elapsed->$key . ' ' . $value . ($elapsed->$key > 1 ? 's' : ''); $value = $elapsed->$key . ' ' . $value . ($elapsed->$key > 1 ? 's' : '');
} else { } else {
unset($string[$key]); unset($string[$key]);