From b4553a64a79928f3af44c790ff1ed1e738ee9799 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 16 Nov 2010 11:51:26 +0000 Subject: [PATCH] Fix: We don't need to have data encode with htmlentities are we are now full utf8. --- htdocs/includes/ckeditor/config.js | 3 +++ htdocs/includes/fckeditor/fckconfig.js | 8 ++++---- htdocs/theme/auguria/fckeditor/fckconfig.js | 6 +++--- htdocs/theme/freelug/fckeditor/fckconfig.js | 6 +++--- htdocs/theme/yellow/fckeditor/fckconfig.js | 6 +++--- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/htdocs/includes/ckeditor/config.js b/htdocs/includes/ckeditor/config.js index 38b00459028..6f32512fbb1 100644 --- a/htdocs/includes/ckeditor/config.js +++ b/htdocs/includes/ckeditor/config.js @@ -8,4 +8,7 @@ CKEDITOR.editorConfig = function( config ) // Define changes to default configuration here. For example: // config.language = 'fr'; // config.uiColor = '#AADC6E'; + config.entities = false; + config.entities_greek = false; + config.entities_latin = false; }; diff --git a/htdocs/includes/fckeditor/fckconfig.js b/htdocs/includes/fckeditor/fckconfig.js index 731851738fd..feb494d62da 100644 --- a/htdocs/includes/fckeditor/fckconfig.js +++ b/htdocs/includes/fckeditor/fckconfig.js @@ -59,12 +59,12 @@ FCKConfig.AutoGrowMax = 400 ; // FCKConfig.ProtectedSource.Add( /(]+>[\s|\S]*?<\/asp:[^\>]+>)|(]+\/>)/gi ) ; // ASP.Net style tags FCKConfig.AutoDetectLanguage = true ; -FCKConfig.DefaultLanguage = 'fr' ; +FCKConfig.DefaultLanguage = 'en' ; FCKConfig.ContentLangDirection = 'ltr' ; -FCKConfig.ProcessHTMLEntities = true ; -FCKConfig.IncludeLatinEntities = true ; -FCKConfig.IncludeGreekEntities = true ; +FCKConfig.ProcessHTMLEntities = false ; +FCKConfig.IncludeLatinEntities = false ; +FCKConfig.IncludeGreekEntities = false ; FCKConfig.ProcessNumericEntities = false ; diff --git a/htdocs/theme/auguria/fckeditor/fckconfig.js b/htdocs/theme/auguria/fckeditor/fckconfig.js index 1e3888b1201..f85055c31ae 100644 --- a/htdocs/theme/auguria/fckeditor/fckconfig.js +++ b/htdocs/theme/auguria/fckeditor/fckconfig.js @@ -62,9 +62,9 @@ FCKConfig.AutoDetectLanguage = true ; FCKConfig.DefaultLanguage = 'fr' ; FCKConfig.ContentLangDirection = 'ltr' ; -FCKConfig.ProcessHTMLEntities = true ; -FCKConfig.IncludeLatinEntities = true ; -FCKConfig.IncludeGreekEntities = true ; +FCKConfig.ProcessHTMLEntities = false ; +FCKConfig.IncludeLatinEntities = false ; +FCKConfig.IncludeGreekEntities = false ; FCKConfig.ProcessNumericEntities = false ; diff --git a/htdocs/theme/freelug/fckeditor/fckconfig.js b/htdocs/theme/freelug/fckeditor/fckconfig.js index 7cdae1856cb..4269661237d 100644 --- a/htdocs/theme/freelug/fckeditor/fckconfig.js +++ b/htdocs/theme/freelug/fckeditor/fckconfig.js @@ -62,9 +62,9 @@ FCKConfig.AutoDetectLanguage = true ; FCKConfig.DefaultLanguage = 'fr' ; FCKConfig.ContentLangDirection = 'ltr' ; -FCKConfig.ProcessHTMLEntities = true ; -FCKConfig.IncludeLatinEntities = true ; -FCKConfig.IncludeGreekEntities = true ; +FCKConfig.ProcessHTMLEntities = false ; +FCKConfig.IncludeLatinEntities = false ; +FCKConfig.IncludeGreekEntities = false ; FCKConfig.ProcessNumericEntities = false ; diff --git a/htdocs/theme/yellow/fckeditor/fckconfig.js b/htdocs/theme/yellow/fckeditor/fckconfig.js index 7cdae1856cb..4269661237d 100644 --- a/htdocs/theme/yellow/fckeditor/fckconfig.js +++ b/htdocs/theme/yellow/fckeditor/fckconfig.js @@ -62,9 +62,9 @@ FCKConfig.AutoDetectLanguage = true ; FCKConfig.DefaultLanguage = 'fr' ; FCKConfig.ContentLangDirection = 'ltr' ; -FCKConfig.ProcessHTMLEntities = true ; -FCKConfig.IncludeLatinEntities = true ; -FCKConfig.IncludeGreekEntities = true ; +FCKConfig.ProcessHTMLEntities = false ; +FCKConfig.IncludeLatinEntities = false ; +FCKConfig.IncludeGreekEntities = false ; FCKConfig.ProcessNumericEntities = false ;