From be057d94f9d6a07f556568fd43a43ba940028f78 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 15 Nov 2010 19:28:00 +0000 Subject: [PATCH] Fix: Replace FIXME tags that were TODO. Still having 3 FIXME. --- htdocs/core/class/commonobject.class.php | 2 +- htdocs/core/class/menubase.class.php | 2 +- htdocs/societe/class/societe.class.php | 8 ++++---- htdocs/theme/eldy/fckeditor/fckconfig.js | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index babc0ebc12d..898a46b9b5e 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1393,7 +1393,7 @@ class CommonObject * @param $dateSelector Show date input fields (if service) * @param $seller Object of seller third party * @param uyer Object of buyer third party - * FIXME This must be moved into a html.class file instead of a business class. + * TODO This must be moved into a html.class file instead of a business class. */ function printLinesList($dateSelector=0,$seller,$buyer) { diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php index 83024c2b70d..5fe82acc993 100644 --- a/htdocs/core/class/menubase.class.php +++ b/htdocs/core/class/menubase.class.php @@ -105,7 +105,7 @@ class Menubase // Get the max rowid in llx_menu and use it as rowid in insert because postgresql // may use an already used value because its internal cursor does not increase when we do // an insert with a forced id. - // Two solution: Disable menu handler with database for postgres or update couter when + // Two solution: Disable menu handler using database when database is postgresql or update counter when // enabling such menus. // Insert request diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index ef46190c8b3..64bc3808498 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1738,7 +1738,7 @@ class Societe extends CommonObject * @param idprof 1,2,3,4 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm) * @param soc Objet societe * @return int <0 si ko, >0 si ok - * FIXME not in business class + * TODO not in business class */ function id_prof_check($idprof,$soc) { @@ -1790,7 +1790,7 @@ class Societe extends CommonObject * @param idprof 1,2,3,4 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm) * @param soc Objet societe * @return string url ou chaine vide si aucune url connue - * FIXME not in business class + * TODO not in business class */ function id_prof_url($idprof,$soc) { @@ -2025,7 +2025,7 @@ class Societe extends CommonObject * @param idprof 1,2,3,4 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm) * @param htmlname Nom de la zone input * @param preselected Default value to show - * FIXME not in business class + * TODO not in business class */ function show_input_id_prof($idprof,$htmlname,$preselected) { @@ -2037,7 +2037,7 @@ class Societe extends CommonObject * @param idprof 1,2,3,4 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm) * @param htmlname Nom de la zone input * @param preselected Default value to show - * FIXME not in business class + * TODO not in business class */ function get_input_id_prof($idprof,$htmlname,$preselected) { diff --git a/htdocs/theme/eldy/fckeditor/fckconfig.js b/htdocs/theme/eldy/fckeditor/fckconfig.js index 1e3888b1201..8b02be5b226 100644 --- a/htdocs/theme/eldy/fckeditor/fckconfig.js +++ b/htdocs/theme/eldy/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 ;