From 416f7b1d5ec1e2e245ea52c4be220b98e7325def Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 22 May 2007 23:07:39 +0000
Subject: [PATCH] "scorie et oubli du flag de reprise dans les scrtips admin
(vsible lors de la restauration)"
---
ecrire/exec/import_all.php | 2 +-
ecrire/inc/admin.php | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ecrire/exec/import_all.php b/ecrire/exec/import_all.php
index e4e8d08bd4..46a6492381 100644
--- a/ecrire/exec/import_all.php
+++ b/ecrire/exec/import_all.php
@@ -78,7 +78,7 @@ function verifier_sauvegarde ($archive) {
if (preg_match('/<SPIP\s+[^>]*version_base="([0-9.]+)"[^>]*version_archive="([^"]+)"/', $buf, $regs)
AND $regs[1] == $spip_version
- AND import_charge_version($regs[2], 'inc', true))
+ AND import_charge_version($regs[2]) )
return ''; // c'est bon
return _T('avis_erreur_version_archive',
diff --git a/ecrire/inc/admin.php b/ecrire/inc/admin.php
index b68b967804..4b46a411d4 100644
--- a/ecrire/inc/admin.php
+++ b/ecrire/inc/admin.php
@@ -22,14 +22,16 @@ include_spip('inc/meta');
// http://doc.spip.org/@inc_admin_dist
function inc_admin_dist($script, $titre, $comment='', $retour='')
{
+ $reprise = true;
if (!isset($GLOBALS['meta'][$script])) {
+ $reprise = false;
debut_admin($script, $titre, $comment);
spip_log("meta: $script " . join(',', $_POST));
ecrire_meta($script, serialize($_POST));
ecrire_metas();
} else spip_log("reprise de $script");
$base = charger_fonction($script, 'base');
- $base($titre);
+ $base($titre,$reprise);
effacer_meta($script);
ecrire_metas();
@unlink(_FILE_META);
--
GitLab