Declaring callbacks when they don't exist

doofinder · Nov 30, 2015 · 503ab09 · 503ab09
1 parent 8b07bab
commit 503ab09
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/dfTools.class.php b/dfTools.class.php
@@ -666,12 +666,16 @@ public static function truncateText($text, $length)
 
   public static function stripHtml($text)
   {
-    function cb1($matches){
-      return chr($matches[1]);
+    if (!function_exists('cb1')){
+      function cb1($matches){
+        return chr($matches[1]);
+      }
     }
-
-    function cb2($matches){
-      return chr('0x'.$matches[1]);
+
+    if (!function_exists('cb2')){
+      function cb2($matches){
+        return chr('0x'.$matches[1]);
+      } 
     }
     $text = html_entity_decode($text, ENT_QUOTES, "ISO-8859-1");
     $text = preg_replace_callback(

diff --git a/dist/doofinder-p1.5-latest.zip b/dist/doofinder-p1.5-latest.zip