diff --git a/ecrire/base/abstract_sql.php b/ecrire/base/abstract_sql.php
index f9c792b7db01882f56f6ae939931e13d58d77f99..8e9f6b0709fd3875772e9165a08739a31475904f 100644
--- a/ecrire/base/abstract_sql.php
+++ b/ecrire/base/abstract_sql.php
@@ -117,7 +117,7 @@ function spip_abstract_showtable($table, $serveur='', $table_spip = false)
}
// http://doc.spip.org/@spip_abstract_create
-function spip_abstract_create($nom, $champs, $cles, $autoinc=false, $temporary=false) {
+function spip_abstract_create($nom, $champs, $cles, $autoinc=false, $temporary=false, $serveur='') {
$f = spip_abstract_serveur('create', $serveur);
return $f($nom, $champs, $cles, $autoinc, $temporary);
}
diff --git a/ecrire/exec/export.php b/ecrire/exec/export.php
index d5331f822b9c84a3088ec1ad0651d84cbc29e320..1aa381c336b4a9a506d7bcd61d4a97b64f0e7e26 100644
--- a/ecrire/exec/export.php
+++ b/ecrire/exec/export.php
@@ -92,7 +92,7 @@ function exec_export_dist()
header("Content-Type: text/plain");
- $rubriques = liste_rubriques($id_rubriques);
+ $rubriques = liste_rubriques($id_rubrique);
if ($rubriques) {
$rubriques = join(",", $rubriques);
diff --git a/ecrire/exec/iconifier.php b/ecrire/exec/iconifier.php
index 34fb5bc39fb253d4e3ce61800df42b99e5240548..fda9fedb2521823600548a6c2c316730024e2c9b 100644
--- a/ecrire/exec/iconifier.php
+++ b/ecrire/exec/iconifier.php
@@ -31,7 +31,7 @@ function exec_iconifier_dist()
}
if ($type == 'id_rubrique')
- $droit = acces_rubrique($id_rubrique);
+ $droit = acces_rubrique($id);
elseif ($type == 'id_auteur')
$droit = (($id == $connect_id_auteur) OR $connect_toutes_rubriques);
elseif ($type == 'id_mot')
@@ -41,7 +41,7 @@ function exec_iconifier_dist()
$row = spip_fetch_array(spip_query("SELECT id_rubrique, statut FROM spip_$table WHERE $type=$id"));
$droit = acces_rubrique($row['id_rubrique']);
if (!$droit AND ($row['statut'] == 'prepa' OR $row['statut'] == 'prop' OR $row['statut'] == 'poubelle'))
- $droit = spip_num_rows(determiner_auteurs_objet('article',$id_article, "id_auteur=$connect_id_auteur"));
+ $droit = spip_num_rows(determiner_auteurs_objet('article',$id, "id_auteur=$connect_id_auteur"));
}
if (!$droit) {
diff --git a/ecrire/exec/import_all.php b/ecrire/exec/import_all.php
index 888c73a714a49ccfdc10d5674ba251696d438aa2..b57ce19551f7d08756c14c291c4d36f7d376c4e7 100644
--- a/ecrire/exec/import_all.php
+++ b/ecrire/exec/import_all.php
@@ -179,7 +179,7 @@ function import_all_fin($request) {
// http://doc.spip.org/@import_queldir
function import_queldir()
{
- global $connect_toutes_rubriques;
+ global $connect_toutes_rubriques, $connect_login;
if ($connect_toutes_rubriques) {
$repertoire = _DIR_DUMP;
@@ -194,11 +194,7 @@ function import_queldir()
$repertoire = preg_replace(','._DIR_TMP.',', '', $repertoire);
$repertoire = sous_repertoire(_DIR_TMP, $repertoire);
}
- if(!@file_exists($repertoire.$connect_login)) {
- $sous_rep = sous_repertoire($repertoire, $connect_login);
- }
- return $sous_rep . '/';
+ return sous_repertoire($repertoire, $connect_login);
}
-
}
?>
diff --git a/ecrire/exec/naviguer.php b/ecrire/exec/naviguer.php
index efae28a16282f96b57819403392f4ffd6f8c60f3..6d247c5e2523bcec96ebb21d2e3ee867edd882d5 100644
--- a/ecrire/exec/naviguer.php
+++ b/ecrire/exec/naviguer.php
@@ -67,7 +67,7 @@ function exec_naviguer_dist()
if ($spip_display != 4) {
- infos_naviguer($id_rubrique, $statut);
+ infos_naviguer($id_rubrique, $statut, $ze_logo);
//
// Logos de la rubrique
@@ -138,7 +138,7 @@ function exec_naviguer_dist()
}
// http://doc.spip.org/@infos_naviguer
-function infos_naviguer($id_rubrique, $statut)
+function infos_naviguer($id_rubrique, $statut, $ze_logo)
{
if ($id_rubrique > 0) {
$res = "\n<div style='font-weight: bold; text-align: center' class='verdana1 spip_xx-small'>"
diff --git a/ecrire/exec/rubriques_edit.php b/ecrire/exec/rubriques_edit.php
index f2f20e692903ff9d15f6a0b7998722ad25df4809..31085eab41a8572cc56e5ef91156b1c7c6fb2602 100644
--- a/ecrire/exec/rubriques_edit.php
+++ b/ecrire/exec/rubriques_edit.php
@@ -68,8 +68,8 @@ function exec_rubriques_edit_dist()
else {
$id_secteur = spip_fetch_array(spip_query("SELECT id_secteur FROM spip_rubriques WHERE id_rubrique='$id_parent'"));
$id_secteur = $id_secteur['id_secteur'];
- if ($id_parent_== $id_secteur)
- $logo_parent = "secteur-24.gif";
+ if ($id_parent == $id_secteur)
+ $logo_parent = "secteur-24.gif";
else $logo_parent = "rubrique-24.gif";
}
diff --git a/ecrire/inc/dater.php b/ecrire/inc/dater.php
index 822130ea9ea6dbb18c4bba48ce6fb5b280a47c7e..5a33eb93ecdaddfcea4831707c48f53887e00261 100644
--- a/ecrire/inc/dater.php
+++ b/ecrire/inc/dater.php
@@ -31,6 +31,8 @@ function inc_dater_dist($id, $flag, $statut, $type, $script, $date, $date_redac=
if ($annee_redac > 4000) $annee_redac -= 9000;
} else $annee_redac = $mois_redac = $jour_redac = 0;
+ $possedeDateRedac= ($annee_redac + $mois_redac + $jour_redac);
+
if (ereg("([0-9]{4})-([0-9]{2})-([0-9]{2})( ([0-9]{2}):([0-9]{2}))?", $date, $regs)) {
$annee = $regs[1];
$mois = $regs[2];
@@ -83,7 +85,6 @@ onchange=\"findObj_forcer('valider_date').style.visibility='visible';\"";
. majuscules(affdate($date))."</b>".aide('artdate')."</div>";
}
- $possedeDateRedac= ($annee_redac + $mois_redac + $jour_redac);
if (($type == 'article')
AND (($options == 'avancees' AND $GLOBALS['meta']["articles_redac"] != 'non')
OR $possedeDateRedac)) {
diff --git a/ecrire/inc/editer_article.php b/ecrire/inc/editer_article.php
index 7a506f5898aedc2dc0785d211097cb1336ac5186..7c08c484bef19304a79c08040872e28942e9c416 100644
--- a/ecrire/inc/editer_article.php
+++ b/ecrire/inc/editer_article.php
@@ -56,7 +56,7 @@ function inc_editer_article_dist($new, $id_rubrique=0, $lier_trad=0, $retour='',
. editer_article_chapo($row['chapo'], $config, $aider)
. editer_article_texte($row['texte'], $config, $aider)
. editer_article_ps($row['ps'], $config, $aider)
- . editer_article_extra($row['extra'], $config, $aider)
+ . editer_article_extra($row['extra'], $id_secteur, $config, $aider)
. $hidden
. ("<div align='right'><input class='fondo' type='submit' value='"
. _T('bouton_enregistrer')
@@ -291,7 +291,7 @@ function editer_article_chapo($chapo, $config, $aider)
}
// http://doc.spip.org/@editer_article_extra
-function editer_article_extra($extra, $config, $aider)
+function editer_article_extra($extra, $id_secteur, $config, $aider)
{
if (!$config['extra'])
return '';
@@ -303,7 +303,7 @@ function editer_article_extra($extra, $config, $aider)
// http://doc.spip.org/@articles_edit_config
function articles_edit_config($row)
{
- global $champs_extra, $spip_ecran, $options, $spip_lang;
+ global $champs_extra, $spip_ecran, $options, $spip_lang, $spip_display;
$config = $GLOBALS['meta'];
$config['lignes'] = ($spip_ecran == "large")? 8 : 5;
diff --git a/ecrire/inc/editer_auteurs.php b/ecrire/inc/editer_auteurs.php
index b799543652beacd903ac579bbc6d3375135ec17e..0b431b564be546ddce5fb5c381d510d86c54ffc7 100644
--- a/ecrire/inc/editer_auteurs.php
+++ b/ecrire/inc/editer_auteurs.php
@@ -254,7 +254,7 @@ function determiner_non_auteurs($les_auteurs, $order)
// http://doc.spip.org/@objet_auteur_select
function objet_auteur_select($result)
{
- global $couleur_claire ;
+ global $couleur_claire, $connect_statut ;
$statut_old = $premiere_old = $res = '';
diff --git a/ecrire/inc/modifier.php b/ecrire/inc/modifier.php
index f4c7b488af87b5b31b653dc814b0e17652f79f8c..aac10d64b0ab92f34bee3c17f25562edb50a6395 100644
--- a/ecrire/inc/modifier.php
+++ b/ecrire/inc/modifier.php
@@ -114,8 +114,6 @@ function revision_document($id_document, $c=false) {
//,'nonvide' => array('titre' => _T('info_sans_titre'))
),
$c);
-
- return ''; // pas d'erreur
}
// http://doc.spip.org/@revision_signature
@@ -127,8 +125,6 @@ function revision_signature($id_signature, $c=false) {
'nonvide' => array('nom_email' => _T('info_sans_titre'))
),
$c);
-
- return ''; // pas d'erreur
}
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index 6fcf02bf56f5c14e9b020e72041cf02baee0ce5f..d5b327cf785363415a4432d5df63680bad8d9595 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -757,7 +757,7 @@ function afficher_articles_trad($titre_table, $requete, $formater, $tmp_var, $ha
// http://doc.spip.org/@afficher_articles_trad_boucle
function afficher_articles_trad_boucle($row)
{
- global $dir_lang, $spip_lang_right;
+ global $dir_lang, $spip_lang_right, $spip_display;
$vals = '';