[BUGFIX] Count doesn't work with group by columns. This fix keeps the group by (#1404)

* [BUGFIX] Count doesn't work with group by columns. This fix keeps the group by.

* [BUGFIX] - Fixed html structural error in pnepage checkout payments section. When using definition term and definition description this items should be located in a definition list.

* [BUGFIX] - Fixed missing opening paragraph in email-template as mentioned in #1401

* [BUGFIX] Added fix to prevent sql injections as recommended by @colinmollenhour

* Added @dbachmann as contributor

* Revert "[BUGFIX] - Fixed missing opening paragraph in email-template as mentioned in #1401"

This reverts commit 3e66cf9.

* Revert "[BUGFIX] - Fixed html structural error in pnepage checkout payments section. When using definition term and definition description this items should be located in a definition list."

This reverts commit 345ab99.

Author: dbachmann

.all-contributorsrc

@@ -919,6 +919,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "dbachmann",
+      "name": "Daniel Bachmann",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/1921769?v=4",
+      "profile": "https://github.com/dbachmann",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7

lib/Varien/Data/Collection/Db.php

@@ -242,8 +242,17 @@ public function getSelectCountSql()
         $countSelect->reset(Zend_Db_Select::LIMIT_OFFSET);
         $countSelect->reset(Zend_Db_Select::COLUMNS);
 
-        $countSelect->columns('COUNT(*)');
-
+        if (count($this->getSelect()->getPart(Zend_Db_Select::GROUP)) > 0) {
+            $countSelect->reset(Zend_Db_Select::GROUP);
+            $countSelect->distinct(true);
+            $group = $this->getSelect()->getPart(Zend_Db_Select::GROUP);
+            $group = array_map(function($token) {
+                return $this->getSelect()->getAdapter()->quoteIdentifier($token, true);
+            }, $group);
+            $countSelect->columns("COUNT(DISTINCT " . implode(", ", $group) . ")");
+        } else {
+            $countSelect->columns('COUNT(*)');
+        }
         return $countSelect;
     }