Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge fixes

Browse source
This commit is contained in:
Naomi 2011-01-28 11:34:57 -05:00
parent c673b12046
commit 7bd96a7bf4
2 changed files with 116 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

4
application/models/StoredFile.php
View file

@ -1814,7 +1814,6 @@ class StoredFile {
$totalRows = $CC_DBC->getOne($sql);
// Where clause
if(isset($data["optWhere"])) {
$where[] = join(" AND ", $data["optWhere"]);
@ -1845,18 +1844,15 @@ class StoredFile {
}
$where[] = "(".join(" AND ", $outerCond).")";
}
// End Where clause
// Order By clause
$orderby = array();
for($i=0; $i<$data["iSortingCols"]; $i++){
$orderby[] = $columnsDisplayed[$data["iSortCol_".$i]]." ".$data["sSortDir_".$i];
}
$orderby[] = "id";
$orderby = join("," , $orderby);
// End Order By clause
//ordered by integer as expected by datatables.