Changeset 559 for trunk/b2-include/b2functions.php

Timestamp:

11/30/2003 12:55:19 AM (22 years ago)

Author:

mikelittle

Message:

Fixed several instances in WordPress where PHP Notices are not being handled correctly.
Fixes supplied by Aaron Jensen (aaron@…).

File:

• trunk/b2-include/b2functions.php (modified) (3 diffs)

trunk/b2-include/b2functions.php

@@ -294 +294 @@
     global $smilies_directory, $use_smilies;
     global $b2_smiliessearch, $b2_smiliesreplace;
-
+    $output = '';
     if ($use_smilies) {
         // HTML loop taken from texturize function, could possible be consolidated
@@ -301 +301 @@
         for ($i = 0; $i < $stop; $i++) {
             $content = $textarr[$i];
-            if ('<' != $content{0}) { // If it's not a tag
+            if ((strlen($content) > 0) && ('<' != $content{0})) { // If it's not a tag
                 $content = str_replace($b2_smiliessearch, $b2_smiliesreplace, $content);
             }
@@ -1629 +1629 @@
     if (isset($b2_filter['all'])) {
         $b2_filter['all'] = (is_string($b2_filter['all'])) ? array($b2_filter['all']) : $b2_filter['all'];
-        $b2_filter[$tag] = array_merge($b2_filter['all'], $b2_filter[$tag]);
+        if (isset($b2_filter[$tag]))
+            $b2_filter[$tag] = array_merge($b2_filter['all'], $b2_filter[$tag]);
+        else
+            $b2_filter[$tag] = array_merge($b2_filter['all'], array());
         $b2_filter[$tag] = array_unique($b2_filter[$tag]);
     }