diff --git a/ecrire/action/premiers_pas.php b/ecrire/action/premiers_pas.php index 4b3fc00a3c86af3f8acdb534c62bdc6071598698..3de5d70e4f2c21d1bb1e0a4c0bea44d7ef914a14 100644 --- a/ecrire/action/premiers_pas.php +++ b/ecrire/action/premiers_pas.php @@ -35,7 +35,8 @@ function action_premiers_pas_dist() { } ecrire_metas(); - $redirect = generer_url_ecrire('accueil'); + include_spip('inc/headers'); + redirige_par_entete(generer_url_ecrire('accueil', '', true)); } // http://doc.spip.org/@action_premiers_pas_pas_1_dist diff --git a/ecrire/inc/acces.php b/ecrire/inc/acces.php index a28425e216ddbad322bdc17d250054a2bd50f15f..2bf0c4f145d1838006b418ad1e1b852980b69dfe 100644 --- a/ecrire/inc/acces.php +++ b/ecrire/inc/acces.php @@ -69,7 +69,7 @@ function creer_uniqid() { function renouvelle_alea() { $alea = md5(creer_uniqid()); - ecrire_meta('alea_ephemere_ancien', $GLOBALS['meta']['alea_ephemere'],'non'); + ecrire_meta('alea_ephemere_ancien', @$GLOBALS['meta']['alea_ephemere'],'non'); ecrire_meta('alea_ephemere', $alea,'non'); ecrire_meta('alea_ephemere_date', time(),'non'); ecrire_metas(); diff --git a/ecrire/inc/premiers_pas.php b/ecrire/inc/premiers_pas.php index 8deebefffbb48d581c13b88b530b75b72266541d..b00e12d8c5ab7cf4652c0426f0d083a062eff7f7 100644 --- a/ecrire/inc/premiers_pas.php +++ b/ecrire/inc/premiers_pas.php @@ -27,7 +27,7 @@ function premiers_pas_etapes($etape,$titre,$texte){ echo "<div id='minipres' style='width:750px;text-align:$spip_lang_left;'>"; if ($etape!=='fin') - echo "<input type='submit' class='fondl' name='cancel' style='cursor:pointer;pointer:hand;' value='"._L("Utiliser directement SPIP")."' />"; + echo generer_action_auteur('premiers_pas', '', '', "<input type='submit' class='fondl' name='cancel' style='cursor:pointer;pointer:hand;' value='"._L("Utiliser directement SPIP")."' />"); echo debut_gauche(); creer_colonne_droite(); debut_droite(); diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php index 63e0d65f1b6e057f73d25e8da5a2488640f4fcd8..f065ea545bcdf511efab84990c22f0f8503ef42f 100644 --- a/ecrire/inc/utils.php +++ b/ecrire/inc/utils.php @@ -1239,7 +1239,8 @@ function spip_initialisation($pi=NULL, $pa=NULL, $ti=NULL, $ta=NULL) { include_spip('inc/meta'); ecrire_metas(); } - $GLOBALS['langue_site'] = $GLOBALS['meta']['langue_site']; + // La meta est indefinie a la premiere installation + $GLOBALS['langue_site'] = @$GLOBALS['meta']['langue_site']; # nombre de pixels maxi pour calcul de la vignette avec gd define('_IMG_GD_MAX_PIXELS', isset($GLOBALS['meta']['max_taille_vignettes'])?$GLOBALS['meta']['max_taille_vignettes']:0);