tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'security/3.5.5' into HEAD

Browse Source
This commit is contained in:
Daniel Hensby 2017-09-28 15:48:29 +01:00
commit 29300c2c2d
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
model/ArrayList.php
View File

@ -448,7 +448,8 @@ class ArrayList extends ViewableData implements SS_List, SS_Filterable, SS_Sorta
// First argument is the direction to be sorted, // First argument is the direction to be sorted,
$multisortArgs[] = &$sortDirection[$column]; $multisortArgs[] = &$sortDirection[$column];
if ($firstRun) { if ($firstRun) {
$multisortArgs[] = SORT_REGULAR; $sortArg = SORT_REGULAR;
$multisortArgs[] = &$sortArg;
} }
$firstRun = false; $firstRun = false;
} }