fix #5038. Suppression de code mort

ecrire/inc/editer.php

@@ -721,89 +721,3 @@ function display_conflit_champ($x) {
 		return "<input type='text' size='40' style='width:99%' value=\"" . entites_html($x) . "\" />\n";
 	}
 }
-
-/**
- * Signaler une erreur entre 2 saisies d'un champ
- *
- * @uses preparer_diff()
- * @uses propre_diff()
- * @uses afficher_para_modifies()
- * @uses afficher_diff()
- * @uses minipres()
- *
- * @param array $conflits
- *     Valeur des champs en conflit
- * @param string $redirect
- * @return string
- */
-function signaler_conflits_edition($conflits, $redirect = '') {
-	include_spip('inc/minipres');
-	include_spip('inc/revisions');
-	include_spip('afficher_diff/champ');
-	include_spip('inc/suivi_versions');
-	include_spip('inc/diff');
-	$diffs = [];
-	foreach ($conflits as $champ => $a) {
-		// probleme de stockage ou conflit d'edition ?
-		$base = $a['save'] ?? $a['base'];
-
-		$diff = new Diff(new DiffTexte());
-		$n = preparer_diff($a['post']);
-		$o = preparer_diff($base);
-		$d = propre_diff(afficher_para_modifies(afficher_diff($diff->comparer($n, $o))));
-
-		$titre = isset($a['save']) ? _L(
-			'Echec lors de l\'enregistrement du champ @champ@',
-			['champ' => $champ]
-		) : $champ;
-
-		$diffs[] = "<h2>$titre</h2>\n"
-			. '<h3>' . _T('info_conflit_edition_differences') . "</h3>\n"
-			. "<div style='max-height:8em; overflow: auto; width:99%;'>" . $d . "</div>\n"
-			. '<h4>' . _T('info_conflit_edition_votre_version') . '</h4>'
-			. display_conflit_champ($a['post'])
-			. '<h4>' . _T('info_conflit_edition_version_enregistree') . '</h4>'
-			. display_conflit_champ($base);
-	}
-
-	if ($redirect) {
-		$id = uniqid(random_int(0, mt_getrandmax()));
-		$redirect = "<form action='$redirect' method='get'
-			id='$id'
-			style='float:" . $GLOBALS['spip_lang_right'] . "; margin-top:2em;'>\n"
-			. form_hidden($redirect)
-			. "<input type='submit' value='" . _T('icone_retour') . "' />
-		</form>\n";
-
-		// pour les documents, on est probablement en ajax : il faut ajaxer
-		if (_AJAX) {
-			$redirect .= '<script type="text/javascript">'
-				. 'setTimeout(function(){$("#' . $id . '")
-			.ajaxForm({target:$("#' . $id . '").parent()});
-			}, 200);'
-				. "</script>\n";
-		}
-	}
-
-	echo minipres(
-		_T('titre_conflit_edition'),
-		'<style>
-.diff-para-deplace { background: #e8e8ff; }
-.diff-para-ajoute { background: #d0ffc0; color: #000; }
-.diff-para-supprime { background: #ffd0c0; color: #904040; text-decoration: line-through; }
-.diff-deplace { background: #e8e8ff; }
-.diff-ajoute { background: #d0ffc0; }
-.diff-supprime { background: #ffd0c0; color: #802020; text-decoration: line-through; }
-.diff-para-deplace .diff-ajoute { background: #b8ffb8; border: 1px solid #808080; }
-.diff-para-deplace .diff-supprime { background: #ffb8b8; border: 1px solid #808080; }
-.diff-para-deplace .diff-deplace { background: #b8b8ff; border: 1px solid #808080; }
-</style>'
-		. '<p>' . _T('info_conflit_edition_avis_non_sauvegarde') . '</p>'
-		. '<p>' . _T('texte_conflit_edition_correction') . '</p>'
-		. "<div style='text-align:" . $GLOBALS['spip_lang_left'] . ";'>"
-		. join("\n", $diffs)
-		. "</div>\n"
-
-		. $redirect
-	);
-}