X-Git-Url: http://git.cyclocoop.org/?p=ptitvelo%2Fweb%2Fwww.git;a=blobdiff_plain;f=www%2Fecrire%2Finc%2Flien.php;h=9fc5d4804f281e93aaa85362630b2f8e146ed5e1;hp=4f5dab37cd2669275590508a27da933f0e4e7a4f;hb=d18fcb8f27a4016e3fa7b50a9b2255d529dca543;hpb=e847eea4a82a7396dd0abf860f9b30d654f38629

diff --git a/www/ecrire/inc/lien.php b/www/ecrire/inc/lien.php
index 4f5dab3..9fc5d48 100644
--- a/www/ecrire/inc/lien.php
+++ b/www/ecrire/inc/lien.php
@@ -169,7 +169,7 @@ function traiter_lien_implicite ($ref, $texte='', $pour='url', $connect='')
 	// dans le cas d'un lien vers un doc, ajouter le type='mime/type'
 	if ($type == 'document'
 	AND $mime = sql_getfetsel('mime_type', 'spip_types_documents',
-			"extension IN (SELECT extension FROM spip_documents where id_document =".sql_quote($id).")",
+			"extension IN (".sql_get_select("extension","spip_documents","id_document=".sql_quote($id)).")",
 			'','','','',$connect)
 	)
 		$r['mime'] = $mime;
@@ -240,6 +240,7 @@ function traiter_modeles($texte, $doublons=false, $echap='', $connect='', $liens
 	if (strpos($texte,"<")!==false AND
 	  preg_match_all('/<[a-z_-]{3,}\s*[0-9|]+/iS', $texte, $matches, PREG_SET_ORDER)) {
 		include_spip('public/assembler');
+		$wrap_embed_html = charger_fonction("wrap_embed_html","inc",true);
 		foreach ($matches as $match) {
 			// Recuperer l'appel complet (y compris un eventuel lien)
 
@@ -300,6 +301,9 @@ function traiter_modeles($texte, $doublons=false, $echap='', $connect='', $liens
 				// le remplacer dans le texte
 				if ($modele !== false) {
 					$modele = protege_js_modeles($modele);
+					if ($wrap_embed_html){
+						$modele = $wrap_embed_html($mod,$modele);
+					}
 					$rempl = code_echappement($modele, $echap);
 					$texte = substr($texte, 0, $a)
 						. $rempl