*
*/
-define('_EXTRAIRE_RESSOURCES', ',' . '<"?(https?://|[\w -]+\.[\w -]+)[^<]*>'.',UimsS');
+define('_EXTRAIRE_RESSOURCES', ',' . '<"?(https?://|[^\s][\w -]+\.[\w -]+)[^<]*>'.',UimsS');
function traiter_ressources($r) {
+ $html = null;
if ($ressource = charger_fonction('ressource', 'inc', true)) {
$html = $ressource($r[0]);
- } else {
+ }
+
+ if (is_null($html)) {
include_spip('inc/lien');
$url = explode(' ', trim($r[0], '<>'));
$url = $url[0];
# <http://url/absolue>
if (preg_match(',^https?://,i', $url))
- $html = propre("<span class='ressource spip_out'><[->".$url."]></span>");
+ $html = PtoBR(propre("<span class='ressource spip_out'><[->".$url."]></span>"));
# <url/relative>
else if (false !== strpos($url, '/'))
- $html = propre("<span class='ressource spip_in'><[->".$url."]></span>");
+ $html = PtoBR(propre("<span class='ressource spip_in'><[->".$url."]></span>"));
# <fichier.rtf>
else {
preg_match(',\.([^.]+)$,', $url, $regs);
if (file_exists($f = _DIR_IMG.$regs[1].'/'.$url)) {
- $html = propre("<span class='ressource spip_in'><[".$url."->".$f."]></span>");
+ $html = PtoBR(propre("<span class='ressource spip_in'><[".$url."->".$f."]></span>"));
} else {
- $html = propre("<span class='ressource'><".$url."></span>");
+ $html = PtoBR(propre("<span class='ressource'><".$url."></span>"));
}
}
}