mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 14:46:56 +02:00
Code Issues Releases Wiki Activity

e_tree_model::multiFieldCmp() string sort fields

Browse Source 
An untested oversight in e_tree_model::multiFieldCmp() where $sort_field
could be a string has now been corrected.

$sort_field now accepts a string to prevent infinite recursion.

Fixes: #3044
This commit is contained in:
Deltik
2018-02-23 15:48:23 -06:00
parent d462a1bfa2
commit 840859a32f
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_handlers/model_class.php
View File

@@ -3480,8 +3480,18 @@ class e_tree_model extends e_front_model
*/ */
protected static function multiFieldCmp($row1, $row2, $sort_field, $sort_order = 1) protected static function multiFieldCmp($row1, $row2, $sort_field, $sort_order = 1)
{ {
// Multiple sort fields
if (is_array($sort_field)) if (is_array($sort_field))
{
$field = array_shift($sort_field); $field = array_shift($sort_field);
}
// One sort field
else
{
$field = $sort_field;
$sort_field = [];
}
$cmp = strnatcmp((string) $row1[$field], (string) $row2[$field]); $cmp = strnatcmp((string) $row1[$field], (string) $row2[$field]);
if ($sort_order === -1 || $sort_order === 1) $cmp *= $sort_order; if ($sort_order === -1 || $sort_order === 1) $cmp *= $sort_order;
if ($cmp === 0 && count($sort_field) >= 1) if ($cmp === 0 && count($sort_field) >= 1)