Merge pull request #3449 from camspiers/patch-2

Fix deprecation warnings in internal SQLQuery usage
This commit is contained in:
Simon Welsh 2014-08-28 12:43:06 +10:00
commit 6fed1f6791

View File

@ -999,8 +999,8 @@ class SQLQuery {
if($column == null) { if($column == null) {
if($this->groupby) { if($this->groupby) {
$countQuery = new SQLQuery(); $countQuery = new SQLQuery();
$countQuery->select("count(*)"); $countQuery->setSelect("count(*)");
$countQuery->from = array('(' . $clone->sql() . ') all_distinct'); $countQuery->setFrom('(' . $clone->sql() . ') all_distinct');
return $countQuery->execute()->value(); return $countQuery->execute()->value();