diff --git a/.gitattributes b/.gitattributes index 8fe6c94022953e7b57540f839e4012ae3d9079df..7d2e34166becfd943f32cf31cb1069dfebbe22e8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,7 +10,7 @@ dist/inc-petition.html -text dist/inc-pied.html -text dist/inc-rubriques.html -text dist/modeles/lesauteurs.html -text -dist/modeles/pagination_dist.html -text +dist/modeles/pagination.html -text dist/modeles/pagination_page.html -text dist/modeles/pagination_page_precedent_suivant.html -text dist/modeles/pagination_precedent_suivant.html -text diff --git a/dist/modeles/pagination_dist.html b/dist/modeles/pagination.html similarity index 100% rename from dist/modeles/pagination_dist.html rename to dist/modeles/pagination.html diff --git a/ecrire/inc/filtres.php b/ecrire/inc/filtres.php index f5fe6261eb03dd9c97f55fec37552212e08f2994..0ae0ec953b5295123c1d028c45570b30ea52907f 100644 --- a/ecrire/inc/filtres.php +++ b/ecrire/inc/filtres.php @@ -1483,7 +1483,7 @@ function calcul_bornes_pagination($courante, $nombre, $max = 10) { // // http://doc.spip.org/@calcul_pagination -function calcul_pagination($total, $nom, $pas, $liste = true, $modele='dist') { +function calcul_pagination($total, $nom, $pas, $liste = true, $modele='') { static $ancres = array(); $bloc_ancre = ""; @@ -1519,7 +1519,8 @@ function calcul_pagination($total, $nom, $pas, $liste = true, $modele='dist') { if (!$liste) return $bloc_ancre; - return recuperer_fond("modeles/pagination_$modele",$pagination); + if ($modele) $modele = '_'.$modele; + return recuperer_fond("modeles/pagination$modele",$pagination); } // recuperere le chemin d'une css existante et :