Skip to content
Snippets Groups Projects
Commit 5bb248ef authored by Bernhard Posselt's avatar Bernhard Posselt
Browse files

Merge pull request #2764 from owncloud/remove-limit-from-count-query

Remove wrong limit parameter from count query in compatibility function
parents 74f90eab 142b020d
Branches
No related tags found
No related merge requests found
...@@ -1077,7 +1077,7 @@ class PDOStatementWrapper{ ...@@ -1077,7 +1077,7 @@ class PDOStatementWrapper{
public function numRows() { public function numRows() {
$regex = '/^SELECT\s+(?:ALL\s+|DISTINCT\s+)?(?:.*?)\s+FROM\s+(.*)$/i'; $regex = '/^SELECT\s+(?:ALL\s+|DISTINCT\s+)?(?:.*?)\s+FROM\s+(.*)$/i';
if (preg_match($regex, $this->statement->queryString, $output) > 0) { if (preg_match($regex, $this->statement->queryString, $output) > 0) {
$query = OC_DB::prepare("SELECT COUNT(*) FROM {$output[1]}", PDO::FETCH_NUM); $query = OC_DB::prepare("SELECT COUNT(*) FROM {$output[1]}");
return $query->execute($this->lastArguments)->fetchColumn(); return $query->execute($this->lastArguments)->fetchColumn();
}else{ }else{
return $this->statement->rowCount(); return $this->statement->rowCount();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment