formatting

Author: taylorotwell

src/Illuminate/Database/Query/Builder.php

@@ -2258,6 +2258,10 @@ protected function runPaginationCountQuery($columns = ['*'])
         if ($this->groups || $this->havings) {
             $clone = $this->cloneForPaginationCount();
 
+            if (is_null($clone->columns) && ! empty($this->joins)) {
+                $clone->select($this->from.'.*');
+            }
+
             return $this->newQuery()
                 ->from(new Expression('('.$clone->toSql().') as '.$this->grammar->wrap('aggregate_table')))
                 ->mergeBindings($clone)
@@ -2280,8 +2284,7 @@ protected function runPaginationCountQuery($columns = ['*'])
      */
     protected function cloneForPaginationCount()
     {
-        return $this->select($this->from.'.*')
-                    ->cloneWithout(['orders', 'limit', 'offset'])
+        return $this->cloneWithout(['orders', 'limit', 'offset'])
                     ->cloneWithoutBindings(['order']);
     }