Merge pull request #9 from dimadimx/feature/add_detecting_string_in_auto_mode

christopheg · web-flow · commit a653329fff90 · 2024-12-16T14:56:18.000+01:00
fix string case-sensitive in auto mode
diff --git a/lib/Skeleton/Pager/Util.php b/lib/Skeleton/Pager/Util.php
@@ -45,8 +45,10 @@ public static function object_sort($objects, $property, $direction = 'asc', $typ
 				}
 			}
 
-			if (is_numeric($property1) AND is_numeric($property2) AND $type == 'auto') {
+			if (is_numeric($property1) && is_numeric($property2) && $type == 'auto') {
 				$type = 'int';
+			} elseif (is_string($property1) && is_string($property2) && $type == 'auto') {
+				$type = 'string';
 			}
 
 			if ($type == 'string') {

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,10 @@ public static function object_sort($objects, $property, $direction = 'asc', $typ`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`- if (is_numeric($property1) AND is_numeric($property2) AND $type == 'auto') {`
	`48`	`+ if (is_numeric($property1) && is_numeric($property2) && $type == 'auto') {`
`49`	`49`	`$type = 'int';`
	`50`	`+ } elseif (is_string($property1) && is_string($property2) && $type == 'auto') {`
	`51`	`+ $type = 'string';`
`50`	`52`	`}`
`51`	`53`
`52`	`54`	`if ($type == 'string') {`