From d311559a4b1f159fa03aebecff6f0fae195fb9c5 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 18 Oct 2010 17:05:55 +0000
Subject: [PATCH] lorsque la balise <head> contient des attributs, il faut
 quand meme etre capable de poser un <base...> en urls arbos report de [16480]

---
 ecrire/public/assembler.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ecrire/public/assembler.php b/ecrire/public/assembler.php
index aa8f684912..c782ee14fc 100644
--- a/ecrire/public/assembler.php
+++ b/ecrire/public/assembler.php
@@ -583,8 +583,12 @@ function page_base_href(&$texte){
 			include_spip('inc/filtres_mini');
 			// ajouter un base qui reglera tous les liens relatifs
 			$base = url_absolue('./');
+			$bbase = "\n<base href=\"$base\" />";
 			if (($pos = strpos($head, '<head>')) !== false)
-				$head = substr_replace($head, "\n<base href=\"$base\" />", $pos+6, 0);
+				$head = substr_replace($head, $bbase, $pos+6, 0);
+			elseif(preg_match(",<head[^>]*>,i",$head,$r)){
+				$head = str_replace($r[0], $r[0].$bbase, $head);
+			}
 			$texte = $head . substr($texte,$poshead);
 			// gerer les ancres
 			$base = $_SERVER['REQUEST_URI'];
-- 
GitLab