From b444351ce88e68084d8355f439a97cbf41937a8c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Thu, 28 Nov 2013 13:52:32 +0100
Subject: [PATCH] =?utf8?q?Bugfix=C2=A0:=20configuration=20du=20baseHref=20?=
 =?utf8?q?pour=20que=20les=20images=20s=E2=80=99affichent=20correctement?=
 =?utf8?q?=20m=C3=AAme=20lors=20de=20la=20cr=C3=A9ation=20du=20document=20?=
 =?utf8?q?(quand=20l=E2=80=99url=20du=20navigateur=20pointe=20vers=20le=20?=
 =?utf8?q?dossier=20contenant=20et=20non=20vers=20le=20nouveau=20contenu).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 skins/generic/wysiwyg_support.pt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/skins/generic/wysiwyg_support.pt b/skins/generic/wysiwyg_support.pt
index ef29cc7..2e9528c 100644
--- a/skins/generic/wysiwyg_support.pt
+++ b/skins/generic/wysiwyg_support.pt
@@ -16,9 +16,11 @@
   <div>
     <script type="text/javascript" tal:attributes="src string:$portal_url/ckeditor/ckeditor.js"></script>
     <script type="text/javascript" tal:content="structure python:'''
-      CKEDITOR.replace('%(inputname)s');
-      CKEDITOR.instances['%(inputname)s'].contentPath = '%(contentPath)s';
       (function(){
+      CKEDITOR.replace('%(inputname)s');
+      var ck = CKEDITOR.instances['%(inputname)s'];
+      ck.contentPath = '%(contentPath)s';
+      ck.config.baseHref = '%(baseHref)s';
       var ckForm = document.getElementById('%(inputname)s').form;
   		if ((AJAX_CONFIG & 2) == 2) {
     		var formManager = new FormManager(ckForm, document.getElementById('mainCell'));
@@ -28,7 +30,9 @@
     		};
   		}
 		  })();
-      ''' % {'inputname' : inputname, 'contentPath' : here.absolute_url(relative=1)}">
+      ''' % {'inputname' : inputname,
+             'contentPath' : here.absolute_url(relative=1),
+             'baseHref' : here.absolute_url()+'/'}">
     </script>
   </div>
 </div>
-- 
2.20.1