admin/core
1
0
Fork 0
mirror of https://github.com/jbcr/core.git synced 2026-04-29 03:33:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

|order filter by negative number sorts correctly

Browse Source
This commit is contained in:
Ivo Valchev
2021-02-24 17:28:22 +01:00
committed by Bob den Otter
parent c49e106866
commit f66496c4d2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Twig/ArrayExtension.php
+6 -1
View File
@@ -5,6 +5,7 @@ declare(strict_types=1);
namespace Bolt\Twig;
use Bolt\Entity\Content;
use Bolt\Entity\Field\NumberField;
use Bolt\Utils\ContentHelper;
use Carbon\Carbon;
use Pagerfanta\Pagerfanta;
@@ -141,7 +142,11 @@ final class ArrayExtension extends AbstractExtension
$bVal = $this->contentHelper->get($b, sprintf('{%s}', $orderOn), $locale);
// If the values look like dates, convert them to proper date objects.
if (strtotime($aVal) && strtotime($bVal)) {
if ($a->getDefinition()->get('fields')->get($orderOn, null) &&
$a->getDefinition()->get('fields')->get($orderOn)->get('type') === NumberField::TYPE) {
$aVal = (int) $aVal;
$bVal = (int) $bVal;
} elseif (strtotime($aVal) && strtotime($bVal)) {
$aVal = Carbon::createFromTimestamp(strtotime($aVal));
$bVal = Carbon::createFromTimestamp(strtotime($bVal));
}