diff --git a/.gitattributes b/.gitattributes
index 5e7dd9151f8fc242984b0c2a524138a8af676b77..99739e29a395ce089e2f30fc6372266d96ab8ec1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,9 +8,7 @@ dist/fond/ajax.html -text
dist/fond/ajax_stat.html -text
dist/formulaires/choix_mots.html -text
dist/formulaires/editer_article.html -text
-dist/formulaires/editer_article/charger.php -text
-dist/formulaires/editer_article/traiter.php -text
-dist/formulaires/editer_article/verifier.php -text
+dist/formulaires/editer_article.php -text
dist/formulaires/editer_breve.html -text
dist/formulaires/editer_breve/charger.php -text
dist/formulaires/editer_breve/traiter.php -text
diff --git a/dist/formulaires/editer_article/charger.php b/dist/formulaires/editer_article.php
similarity index 71%
rename from dist/formulaires/editer_article/charger.php
rename to dist/formulaires/editer_article.php
index b196d3c999b6eab2ecc885aac8be0907e5b04c98..1d273a86fbfada0278a1615625fadd0304635c45 100644
--- a/dist/formulaires/editer_article/charger.php
+++ b/dist/formulaires/editer_article.php
@@ -34,4 +34,16 @@ function articles_edit_config($row)
$config['restreint'] = ($row['statut'] == 'publie');
return $config;
}
+
+function formulaires_editer_article_verifier_dist($id_article='new', $id_rubrique=0, $lier_trad=0, $retour='', $config_fonc='articles_edit_config', $row=array(), $hidden=''){
+
+ $erreurs = formulaires_editer_objet_verifier('article',$id_article,array('titre'));
+ return $erreurs;
+}
+
+// http://doc.spip.org/@inc_editer_article_dist
+function formulaires_editer_article_traiter_dist($id_article='new', $id_rubrique=0, $lier_trad=0, $retour='', $config_fonc='articles_edit_config', $row=array(), $hidden=''){
+ return formulaires_editer_objet_traiter('article',$id_article,$id_rubrique,$lier_trad,$retour,$config_fonc,$row,$hidden);
+}
+
?>
\ No newline at end of file
diff --git a/dist/formulaires/editer_article/traiter.php b/dist/formulaires/editer_article/traiter.php
deleted file mode 100644
index ddaac26ffdb1f9fcd26ae4534bd163f6a1fd4879..0000000000000000000000000000000000000000
--- a/dist/formulaires/editer_article/traiter.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/***************************************************************************\
- * SPIP, Systeme de publication pour l'internet *
- * *
- * Copyright (c) 2001-2008 *
- * Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James *
- * *
- * Ce programme est un logiciel libre distribue sous licence GNU/GPL. *
- * Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
-\***************************************************************************/
-
-if (!defined("_ECRIRE_INC_VERSION")) return;
-
-include_spip('inc/actions');
-include_spip('inc/editer');
-
-// http://doc.spip.org/@inc_editer_article_dist
-function formulaires_editer_article_traiter_dist($id_article='new', $id_rubrique=0, $lier_trad=0, $retour='', $config_fonc='articles_edit_config', $row=array(), $hidden=''){
- return formulaires_editer_objet_traiter('article',$id_article,$id_rubrique,$lier_trad,$retour,$config_fonc,$row,$hidden);
-}
-
-?>
\ No newline at end of file
diff --git a/dist/formulaires/editer_article/verifier.php b/dist/formulaires/editer_article/verifier.php
deleted file mode 100644
index 7c6759828fb70d225e78c7dbc32726d45d6d7aab..0000000000000000000000000000000000000000
--- a/dist/formulaires/editer_article/verifier.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/***************************************************************************\
- * SPIP, Systeme de publication pour l'internet *
- * *
- * Copyright (c) 2001-2008 *
- * Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James *
- * *
- * Ce programme est un logiciel libre distribue sous licence GNU/GPL. *
- * Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. *
-\***************************************************************************/
-
-if (!defined("_ECRIRE_INC_VERSION")) return;
-
-include_spip('inc/actions');
-include_spip('inc/editer');
-
-function formulaires_editer_article_verifier_dist($id_article='new', $id_rubrique=0, $lier_trad=0, $retour='', $config_fonc='articles_edit_config', $row=array(), $hidden=''){
-
- $erreurs = formulaires_editer_objet_verifier('article',$id_article,array('titre'));
- return $erreurs;
-}
-
-?>
\ No newline at end of file