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

model/SqlModel.php

@@ -215,7 +215,7 @@ abstract class SqlModel extends Model
         $order = isset($order['sort']) ? $this->order($order, $order['sort']) : false;
         $limit = $this->db->limitExpr($limit);
         $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) : '')
                 . (($group_by) ? (' GROUP BY ' . $group_by) : '')
                 . (($order) ? ($order) : '')