diff options
| author | mamouneyya <mamoun.diraneyya@gmail.com> | 2010-08-02 05:45:48 +0300 |
|---|---|---|
| committer | mamouneyya <mamoun.diraneyya@gmail.com> | 2010-08-02 05:45:48 +0300 |
| commit | 0a128bab0a788288c5291491a68bd1c9ab432825 (patch) | |
| tree | 29e9887258865343dc1a6e6322a3933cf6527c61 /system/libraries | |
| parent | 8e1ae7549362688dd38e053dd736ddc5fc6a4982 (diff) | |
| parent | 9369fd55a36183b7dc1e4b42af46a8f649a66578 (diff) | |
Merge remote branch 'gallery3/master'
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/Database_Builder.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/system/libraries/Database_Builder.php b/system/libraries/Database_Builder.php index 62b2a163..e86ce379 100644 --- a/system/libraries/Database_Builder.php +++ b/system/libraries/Database_Builder.php @@ -1021,14 +1021,14 @@ class Database_Builder_Core { $sql .= "\n".'WHERE '.$this->compile_conditions($this->where); } - if ( ! empty($this->having)) + if ( ! empty($this->group_by)) { - $sql .= "\n".'HAVING '.$this->compile_conditions($this->having); + $sql .= "\n".'GROUP BY '.$this->compile_group_by(); } - if ( ! empty($this->group_by)) + if ( ! empty($this->having)) { - $sql .= "\n".'GROUP BY '.$this->compile_group_by(); + $sql .= "\n".'HAVING '.$this->compile_conditions($this->having); } if ( ! empty($this->order_by)) |