Fix banana stand-alone

git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@197 9869982d-c50d-0410-be91-f2a2ec7c7c7b

diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in
index cef4300..dc29078 100644 (file)
--- a/banana/banana.inc.php.in
+++ b/banana/banana.inc.php.in
@@ -162,7 +162,6 @@ class Banana
             Banana::load('page');
         }
         Banana::$page = new $pageclass;
-
         $types = array('multipart/report' => _b_('Rapport d\'erreur'),
                        'multipart/mixed'  => _b_('Composition'),
                        'text/html'        => _b_('Texte formaté'),

diff --git a/banana/message.func.inc.php b/banana/message.func.inc.php
index be686ec..e8aeef8 100644 (file)
--- a/banana/message.func.inc.php
+++ b/banana/message.func.inc.php
@@ -331,7 +331,7 @@ function banana_filterCss($css)
  */
 function banana_cleanHtml($source, $to_xhtml = false)
 {
-    if (!function_exists('tidy_repair_string')) {
+    if (function_exists('tidy_repair_string')) {
         $tidy_config = array('drop-empty-paras' => true,
                              'drop-proprietary-attributes' => true,
                              'hide-comments' => true,

diff --git a/banana/message.inc.php b/banana/message.inc.php
index 01686a1..0855eba 100644 (file)
--- a/banana/message.inc.php
+++ b/banana/message.inc.php
@@ -108,7 +108,7 @@ final class BananaMessage extends BananaMimePart
 
           case "subject":
             $text = stripslashes($text);
-            $text = html_entities($text);
+            $text = banana_htmlentities($text);
             return banana_catchFormats($text);
 
           default:

diff --git a/banana/text.func.inc.php b/banana/text.func.inc.php
index 48e9b1f..d1a5c30 100644 (file)
--- a/banana/text.func.inc.php
+++ b/banana/text.func.inc.php
@@ -7,9 +7,16 @@
 * Copyright: See COPYING files that comes with this distribution\r
 ********************************************************************************/\r
 \r
-function _b_($str)\r
-{\r
-    return dgettext('banana', $str);\r
+if (function_exists('dgettext')) {\r
+    function _b_($str)\r
+    {\r
+        return dgettext('banana', $str);\r
+    }\r
+} else {\r
+    function _b_($str)\r
+    {\r
+        return $str;\r
+    }\r
 }\r
 \r
 if (!function_exists('is_utf8')) {\r