[SPIP] ~v3.2.4-->v3.2.5

[lhc/web/www.git] / www / ecrire / inc_version.php

diff --git a/www/ecrire/inc_version.php b/www/ecrire/inc_version.php
index f6de654..41ef1c3 100644 (file)
--- a/www/ecrire/inc_version.php
+++ b/www/ecrire/inc_version.php
@@ -372,7 +372,7 @@ $liste_des_authentifications = array(
 // pour specifier les versions de SPIP necessaires
 // il faut s'en tenir a un nombre de decimales fixe
 // ex : 2.0.0, 2.0.0-dev, 2.0.0-beta, 2.0.0-beta2
-$spip_version_branche = "3.2.4";
+$spip_version_branche = "3.2.5";
 // cette version dev accepte tous les plugins compatible avec la version ci-dessous
 // a supprimer en phase beta/rc/release
 #define('_DEV_VERSION_SPIP_COMPAT',"3.1.3");
@@ -515,7 +515,12 @@ if (!defined('_HEADER_COMPOSED_BY')) {
        define('_HEADER_COMPOSED_BY', "Composed-By: SPIP");
 }
 if (!headers_sent() and _HEADER_COMPOSED_BY) {
-       header("Vary: Cookie, Accept-Encoding");
+       if (!defined('_HEADER_VARY')) {
+               define('_HEADER_VARY', "Vary: Cookie, Accept-Encoding");
+       }
+       if (_HEADER_VARY) {
+               header(_HEADER_VARY);
+       }
        if (!isset($GLOBALS['spip_header_silencieux']) or !$GLOBALS['spip_header_silencieux']) {
                include_spip('inc/filtres_mini');
                header(_HEADER_COMPOSED_BY . " $spip_version_affichee @ www.spip.net + " . url_absolue(_DIR_VAR . "config.txt"));