diff --git a/ecrire/inc_articles.php b/ecrire/inc_articles.php index 80dac8ea87bcaab10da16deee6ff290a8c150a7d..023628067f5bfafae6d194275526e57e032a07ab 100644 --- a/ecrire/inc_articles.php +++ b/ecrire/inc_articles.php @@ -1449,7 +1449,7 @@ function revisions_articles ($id_article, $id_secteur, $id_rubrique, $id_rubriqu // Stockage des versions : creer une premier version si non-existante if (($GLOBALS['meta']["articles_versions"]=='oui') && $flag_revisions) { - include_ecrire("lab_revisions"); + include_ecrire("inc_revisions"); if ($new != 'oui') { $query = "SELECT id_article FROM spip_versions WHERE id_article=$id_article LIMIT 1"; if (!spip_num_rows(spip_query($query))) { diff --git a/ecrire/inc_articles_ortho.php b/ecrire/inc_articles_ortho.php index 3f692bc7ec083629215443ea29ac10744d2af8b2..6b54abd02a7ff8bd0478daec7b316fb05921fd59 100644 --- a/ecrire/inc_articles_ortho.php +++ b/ecrire/inc_articles_ortho.php @@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return; include_ecrire("inc_presentation"); include_ecrire("inc_distant"); -include_ecrire("lab_ortho"); +include_ecrire("inc_ortho"); function articles_ortho_dist() { diff --git a/ecrire/inc_articles_versions.php b/ecrire/inc_articles_versions.php index b2c3c8a94bd67e6111c27f9da60f795e0d2bae34..99c0ca2c1f56ca3fc51eeb7304631b0b59a18bc1 100644 --- a/ecrire/inc_articles_versions.php +++ b/ecrire/inc_articles_versions.php @@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return; include_ecrire("inc_presentation"); -include_ecrire("lab_revisions"); +include_ecrire("inc_revisions"); function articles_versions_dist() { @@ -81,7 +81,7 @@ if (!$id_diff) { // if ($id_version && $id_diff) { - include_ecrire("lab_diff"); + include_ecrire("inc_diff"); if ($id_diff > $id_version) { $t = $id_version; diff --git a/ecrire/lab_diff.php b/ecrire/inc_diff.php similarity index 100% rename from ecrire/lab_diff.php rename to ecrire/inc_diff.php diff --git a/ecrire/inc_getdocument.php3 b/ecrire/inc_getdocument.php3 index 5a6c5286ad346836342b77337196fcfe44390cca..eb91add7b1039cce1fd0e0fb6a080afcd8a4f1a4 100644 --- a/ecrire/inc_getdocument.php3 +++ b/ecrire/inc_getdocument.php3 @@ -261,7 +261,7 @@ function ajouter_un_document ($source, $nom_envoye, $type_lien, $id_lien, $mode, $tmp = $tmp_dir.'/'.translitteration($nom_envoye); $nom_envoye .= '.zip'; # conserver l'extension dans le nom de fichier, par exemple toto.js => toto.js.zip $fichier = deplacer_fichier_upload($source, $tmp); - include_ecrire('pclzip.lib'); + include_ecrire('inc_pclzip'); $source = _DIR_IMG.'tmp/archive.zip'; $archive = new PclZip($source); $v_list = $archive->create($tmp, @@ -412,7 +412,7 @@ function examiner_les_fichiers($files, $mode, $type, $id, $id_document, $hash, $ ); if (!$zip) die ('Erreur upload zip'); # pathologique // Est-ce qu'on sait le lire ? - include_ecrire('pclzip.lib'); + include_ecrire('inc_pclzip'); $archive = new PclZip($zip); if ($archive) { // presenter une interface pour choisir si fichier joint ou decompacte diff --git a/ecrire/inc_majbase.php3 b/ecrire/inc_majbase.php3 index 744ea15b33ace606708cadf8186b51ec24dbf501..e0eb5b9bdd0d5dc5071b8b9bdae2f0ab49369153 100644 --- a/ecrire/inc_majbase.php3 +++ b/ecrire/inc_majbase.php3 @@ -907,7 +907,7 @@ function maj_base() { #if ($version_installee < 1.806) # maj_version(1.806); - // URLs propres (lab_version = 0.12) + // URLs propres (inc_version = 0.12) if ($version_installee < 1.807) { foreach (array('articles', 'breves', 'rubriques', 'mots') as $objets) { spip_query("ALTER TABLE spip_$objets diff --git a/ecrire/lab_ortho.php b/ecrire/inc_ortho.php similarity index 100% rename from ecrire/lab_ortho.php rename to ecrire/inc_ortho.php diff --git a/ecrire/pclzip.lib.php b/ecrire/inc_pclzip.php similarity index 100% rename from ecrire/pclzip.lib.php rename to ecrire/inc_pclzip.php diff --git a/ecrire/lab_revisions.php b/ecrire/inc_revisions.php similarity index 100% rename from ecrire/lab_revisions.php rename to ecrire/inc_revisions.php diff --git a/ecrire/inc_spip_action_joindre.php b/ecrire/inc_spip_action_joindre.php index d083c0fd64f8670c54ecef1478c1cb060e60a6f8..4fd66afc1958a8f974fbebdb3c4131dad28bd6de 100644 --- a/ecrire/inc_spip_action_joindre.php +++ b/ecrire/inc_spip_action_joindre.php @@ -137,7 +137,7 @@ function spip_action_joindre6($arg, $mode, $type, $id, $id_document,$hash, $id_a { define('_tmp_dir', creer_repertoire_documents($hash)); if (_tmp_dir == _DIR_DOC) die(_L('Opération impossible')); - include_ecrire('pclzip.lib'); + include_ecrire('inc_pclzip'); $archive = new PclZip($arg); $archive->extract( PCLZIP_OPT_PATH, _tmp_dir, diff --git a/ecrire/inc_suivi_versions.php b/ecrire/inc_suivi_versions.php index 435b4d7097ff5ed35be37d11bce16310529b32a1..4b021b4afa38d90f39da8f82107eacb8fb812830 100644 --- a/ecrire/inc_suivi_versions.php +++ b/ecrire/inc_suivi_versions.php @@ -12,8 +12,8 @@ if (!defined("_ECRIRE_INC_VERSION")) return; -include_ecrire("lab_revisions"); -include_ecrire("lab_diff"); +include_ecrire("inc_revisions"); +include_ecrire("inc_diff"); function afficher_para_modifies ($texte, $court = false) { // Limiter la taille de l'affichage