From cce23a8ae18a3d45035b8721254e037ec75e7d22 Mon Sep 17 00:00:00 2001
From: b_b <brunobergot@gmail.com>
Date: Wed, 24 Jan 2018 14:44:21 +0000
Subject: [PATCH] =?UTF-8?q?Fix=20#3557=20:=20simplifier=20l'ent=C3=AAte=20?=
=?UTF-8?q?compsed-by=20en=20y=20indiquant=20l'url=20du=20fichier=20local/?=
=?UTF-8?q?config.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc/plugin.php | 1 -
ecrire/inc_version.php | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/ecrire/inc/plugin.php b/ecrire/inc/plugin.php
index bd9968cf8e..d88d346bbd 100644
--- a/ecrire/inc/plugin.php
+++ b/ecrire/inc/plugin.php
@@ -843,7 +843,6 @@ function ecrire_plugin_actifs($plugin, $pipe_recherche = false, $operation = 'ra
$liste = array_diff_key($liste, $plugin_valides);
ecrire_meta('plugin_attente', serialize($liste));
$header = strtolower(implode(",", $header));
- ecrire_meta('plugin_header', substr($header, 0, 900));
if (!isset($GLOBALS['spip_header_silencieux']) or !$GLOBALS['spip_header_silencieux']) {
ecrire_fichier(_DIR_VAR . "config.txt",
(defined('_HEADER_COMPOSED_BY') ? _HEADER_COMPOSED_BY : "Composed-By: SPIP") . ' ' . $GLOBALS['spip_version_affichee'] . " @ www.spip.net + " . $header);
diff --git a/ecrire/inc_version.php b/ecrire/inc_version.php
index cd2e6fecab..a387fa14d1 100644
--- a/ecrire/inc_version.php
+++ b/ecrire/inc_version.php
@@ -505,7 +505,7 @@ if (!defined('_HEADER_COMPOSED_BY')) {
if (!headers_sent()) {
header("Vary: Cookie, Accept-Encoding");
if (!isset($GLOBALS['spip_header_silencieux']) or !$GLOBALS['spip_header_silencieux']) {
- header(_HEADER_COMPOSED_BY . " $spip_version_affichee @ www.spip.net" . (isset($GLOBALS['meta']['plugin_header']) ? (" + " . $GLOBALS['meta']['plugin_header']) : ""));
+ header(_HEADER_COMPOSED_BY . " $spip_version_affichee @ www.spip.net + " . url_absolue(_DIR_VAR . "config.txt"));
} else // header minimal
{
header(_HEADER_COMPOSED_BY . " @ www.spip.net");
--
GitLab