Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

No commit message

  • Loading branch information...
commit ff125a2bbacb8ba3ef913062ca95f5d21bf7cf77 1 parent d91e53a
qiang.xue authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  framework/db/ar/CActiveRecord.php
View
2  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'])
Please sign in to comment.
Something went wrong with that request. Please try again.