Issue #3311 : renommer les fonctions

* generer_url_ecrire_objet => generer_objet_url_ecrire
* generer_url_ecrire_entite_edit => generer_objet_url_ecrire_edit
(les anciens nommages restent fonctionnels mais @deprecated)

ecrire/inc/urls.php

@@ -248,13 +248,15 @@ function nettoyer_url_page($url, $contexte = []) {
  * @return string
  *
  */
-function generer_url_ecrire_objet($objet, $id, $args = '', $ancre = '', $public = null, string $connect = '') {
+function generer_objet_url_ecrire($objet, $id, $args = '', $ancre = '', $public = null, string $connect = '') {
 	static $furls = [];
 	if (!isset($furls[$objet])) {
 		if (
-			function_exists($f = 'generer_url_ecrire_' . $objet)
+			function_exists($f = 'generer_'.$objet.'_url_ecrire')
 			// ou definie par un plugin
 			or $f = charger_fonction($f, 'urls', true)
+			// deprecated
+			or function_exists($f = 'generer_url_ecrire_' . $objet) or $f = charger_fonction($f, 'urls', true)
 		) {
 			$furls[$objet] = $f;
 		} else {
@@ -279,3 +281,11 @@ function generer_url_ecrire_objet($objet, $id, $args = '', $ancre = '', $public
 
 	return generer_url_ecrire(objet_info($objet, 'url_voir'), $a . ($args ? "&$args" : '')) . ($ancre ? "#$ancre" : '');
 }
+
+/**
+ * @deprecated
+ * @see generer_objet_url_ecrire
+ */
+function generer_url_ecrire_objet($objet, $id, $args = '', $ancre = '', $public = null, string $connect = ''){
+	return generer_objet_url_ecrire($objet, $id, $args, $ancre, $public, $connect);
+}
\ No newline at end of file

ecrire/inc/utils.php

@@ -1797,10 +1797,10 @@ function generer_url_entite($id = '', $entite = '', $args = '', $ancre = '', $pu
 		if (!$entite) {
 			return '';
 		}
-		if (!function_exists('generer_url_ecrire_objet')) {
+		if (!function_exists('generer_objet_url_ecrire')) {
 			include_spip('inc/urls');
 		}
-		$res = generer_url_ecrire_objet($entite, $id, $args, $ancre, false);
+		$res = generer_objet_url_ecrire($entite, $id, $args, $ancre, false);
 	} else {
 		if ($type === null) {
 			$type = $GLOBALS['type_urls'] ?? $GLOBALS['meta']['type_urls'] ?? 'page'; // sinon type "page" par défaut
@@ -1839,7 +1839,15 @@ function generer_url_entite($id = '', $entite = '', $args = '', $ancre = '', $pu
 	return '';
 }
 
-function generer_url_ecrire_entite_edit($id, $entite, $args = '', $ancre = '') {
+/**
+ * Generer l'url vers la page d'edition dans ecrire/
+ * @param int $id
+ * @param string $entite
+ * @param string $args
+ * @param string $ancre
+ * @return string
+ */
+function generer_objet_url_ecrire_edit($id, $entite, $args = '', $ancre = '') {
 	$exec = objet_info($entite, 'url_edit');
 	$url = generer_url_ecrire($exec, $args);
 	if (intval($id)) {
@@ -1854,6 +1862,15 @@ function generer_url_ecrire_entite_edit($id, $entite, $args = '', $ancre = '') {
 	return $url;
 }
 
+/**
+ * @deprecated
+ * @see generer_objet_url_ecrire_edit
+ */
+function generer_url_ecrire_entite_edit($id, $entite, $args = '', $ancre = ''){
+	return generer_objet_url_ecrire_edit($id, $entite, $args, $ancre);
+}
+
+
 function urls_connect_dist($i, &$entite, $args = '', $ancre = '', $public = null) {
 	include_spip('base/connect_sql');
 	$id_type = id_table_objet($entite, $public);