Permalink
Browse files

No commit message

  • Loading branch information...
1 parent d91e53a commit ff125a2bbacb8ba3ef913062ca95f5d21bf7cf77 qiang.xue committed Dec 14, 2009
Showing with 1 addition and 1 deletion.
  1. +1 −1 framework/db/ar/CActiveRecord.php
@@ -1995,7 +1995,7 @@ public function mergeWith($criteria)
if($this->order==='')
$this->order=$criteria['order'];
else if($criteria['order']!=='')
- $this->order.=', '.$criteria['order'];
+ $this->order=$criteria['order'].', '.$this->order;
}
if(isset($criteria['group']) && $this->group!==$criteria['group'])

0 comments on commit ff125a2

Please sign in to comment.