From 3b0f6310c176b67ba2ee653da90a7bd9211af12f Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Wed, 16 Aug 2006 18:03:42 +0000
Subject: [PATCH] pagination_dist devient pagination
---
.gitattributes | 2 +-
dist/modeles/{pagination_dist.html => pagination.html} | 0
ecrire/inc/filtres.php | 5 +++--
3 files changed, 4 insertions(+), 3 deletions(-)
rename dist/modeles/{pagination_dist.html => pagination.html} (100%)
diff --git a/.gitattributes b/.gitattributes
index 8fe6c94022..7d2e34166b 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 f5fe6261eb..0ae0ec953b 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 :
--
GitLab