Merge pull request #413 from oldrind/master

修正Model类order方法一处bug,优化改进视图模型
This commit is contained in:
ThinkPHP
2016-03-21 17:37:30 +08:00
2 changed files with 129 additions and 127 deletions

View File

@@ -1730,8 +1730,8 @@ class Model
public function order($field, $order = null)
{
if (!empty($field)) {
if (!is_array($field)) {
$field = empty($order) ? [$field] : [(string) $field => (string) $order];
if (is_string($field)) {
$field = empty($order) ? $field : [$field => $order];
}
$this->options['order'] = $field;
}