Skip to content

U
User
Commit 0ae03712 authored by zhangjun's avatar zhangjun
Browse files
Options

合并分支 'release_zj_edit3' 到 'release' 

修改

查看合并请求 !11
parents 7f98b809 6f8ccd23
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
esf_core/core/MY_Model.php
View file @ 0ae03712
...@@ -248,11 +248,11 @@ class MY_Model extends CI_Model ...@@ -248,11 +248,11 @@ class MY_Model extends CI_Model
{ {
if (strlen($data['limit']) && is_numeric($data['limit'])) if (strlen($data['limit']) && is_numeric($data['limit']))
{ {
($data['limit'] > 0) ? $this->db->limit($data['offset'], $data['limit']) : $this->db->limit($data['offset']); ($data['limit'] > 0) ? $this->db->offset($data['offset'])->limit($data['limit']) : $this->db->offset($data['offset'])->limit(20);
} }
else else
{ {
$this->db->limit($data['offset']); $this->db->offset($data['offset'])->limit(20);
} }
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment