diff --git a/ecrire/exec/import_all.php b/ecrire/exec/import_all.php index e4e8d08bd469b7cffc1ec6b658e9439591230c2d..46a64923813e03da91b8212f5195ab6bf0adcee1 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 b68b96780475a6c955033df42de0697bdde76713..4b46a411d4168dd0b1f7524037df7b2f6bbc6c82 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);