wpstudio/majestic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'sql_criteria' of dimti.ru:majestic into sql_criteria

Browse Source
This commit is contained in:
Alexander Demidov
2014-05-15 17:47:23 +04:00
parent ff148f2f95 906ffe07a8
commit e8e266a101
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
model/SqlModel.php
View File

@ -215,7 +215,7 @@ abstract class SqlModel extends Model
$order = isset($order['sort']) ? $this->order($order, $order['sort']) : false; $order = isset($order['sort']) ? $this->order($order, $order['sort']) : false;
$limit = $this->db->limitExpr($limit); $limit = $this->db->limitExpr($limit);
$result = $this->query( $result = $this->query(
(($sql_expression) ? $sql_expression : ('SELECT ' . $select . ' FROM ' . $this->table())) (($sql_expression) ? $sql_expression : ('SELECT ' . $select . ' FROM ' . $this->identify($this->table())))
. (($where) ? (' WHERE ' . $where) : '') . (($where) ? (' WHERE ' . $where) : '')
. (($group_by) ? (' GROUP BY ' . $group_by) : '') . (($group_by) ? (' GROUP BY ' . $group_by) : '')
. (($order) ? ($order) : '') . (($order) ? ($order) : '')