[SPIP] ~v3.0.12-->3.0.13

[ptitvelo/web/www.git] / www / ecrire / req / pg.php

diff --git a/www/ecrire/req/pg.php b/www/ecrire/req/pg.php
index 57d23e1..e4cad0e 100644 (file)
--- a/www/ecrire/req/pg.php
+++ b/www/ecrire/req/pg.php
@@ -574,6 +574,10 @@ function spip_pg_groupby($groupby, $from, $select)
        if (!$groupby) return '';
 
        $groupby = spip_pg_frommysql($groupby);
+       // Ne pas mettre dans le Group-By des valeurs numeriques
+       // issue de prepare_recherche
+       $groupby = preg_replace('/^\s*\d+\s+AS\s+\w+\s*,?\s*/i','', $groupby);
+       $groupby = preg_replace('/,\s*\d+\s+AS\s+\w+\s*/i','', $groupby);
        $groupby = preg_replace('/\s+AS\s+\w+\s*/i','', $groupby);
 
        return "\nGROUP BY $groupby";