Navigation Menu

Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/Yii' into Yii
Browse files Browse the repository at this point in the history
  • Loading branch information
lukas-slansky committed Apr 26, 2012
2 parents 1f4ac72 + 07f1b08 commit daccf3d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion application/controllers/admin/participantsaction.php
Expand Up @@ -847,6 +847,7 @@ function getParticipantsResults_json()
$aData->total = ceil($aData->records / $limit);
}
$i = 0;

foreach ($records as $row => $value)
{
$username = User::getName($value['owner_uid']); //for conversion of uid to human readable names
Expand Down Expand Up @@ -895,7 +896,7 @@ function subval_sort($a, $subkey, $order)
$sortedarray = subval_sort($sortablearray, $indexsort, Yii::app()->request->getPost('sord'));
$i = 0;
$count = count($sortedarray[0]);
$aData = new stdClass();

foreach ($sortedarray as $key => $value)
{
$aData->rows[$i]['id'] = $value[0];
Expand Down

0 comments on commit daccf3d

Please sign in to comment.