Changeset 354

Timestamp:

09/02/2003 11:22:04 PM (23 years ago)

Author:

mikelittle

Message:

Fixes from Patrick MARIE <mycroft@…>
regarding un-initialized vars.

Location:

trunk

Files:

• b2-include/b2functions.php (modified) (7 diffs)
• b2calendar.php (modified) (1 diff)

trunk/b2-include/b2functions.php

@@ -17 +17 @@
 /***** Formatting functions *****/
 function wptexturize($text) {
+        $output = "";
         $textarr = preg_split("/(<.*>)/U", $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between
         $stop = count($textarr); $next = true; // loop stuff
@@ -25 +26 @@
                         $curl = str_replace('</q>', '&#8221;', $curl);
                 }
-                if ('<' != $curl{0} && $next) { // If it's not a tag
+                if (isset($curl{0}) && '<' != $curl{0} && $next) { // If it's not a tag
                         $curl = str_replace('---', '&#8212;', $curl);
                         $curl = str_replace('--', '&#8211;', $curl);
@@ -36 +37 @@
                         $curl = str_replace($cockney, $cockneyreplace, $curl);
 
-                
                         $curl = preg_replace("/'s/", "&#8217;s", $curl);
                         $curl = preg_replace("/'(\d\d(?:&#8217;|')?s)/", "&#8217;$1", $curl);
@@ -219 +219 @@
 
                 // converts HTML-entities to their display values in order to convert them again later
-                $content = preg_replace('/['.chr(127).'-'.chr(255).']/e', '"&#".ord(\0).";"', $content );
+                $content = preg_replace('/['.chr(127).'-'.chr(255).']/e', '"&#".ord(\'\0\').";"', $content );
                 $content = strtr($content, $b2_htmltrans);
 
@@ -272 +272 @@
         global $smilies_directory, $use_smilies;
         global $b2_smiliessearch, $b2_smiliesreplace;
+
         if ($use_smilies) {
                 // HTML loop taken from texturize function, could possible be consolidated
@@ -283 +284 @@
                         $output .= $content;
                 }
+        } else {
+                // return default text.
+                $output = $text;
         }
         return $output;
@@ -1281 +1285 @@
 }
 
-
 ?>

trunk/b2calendar.php

@@ -58 +58 @@
 
 $w = $HTTP_GET_VARS['w'];
+if (isset($HTTP_GET_VARS['w'])) {
+    $w = $HTTP_GET_VARS['w'];
+}
 
 if (isset($calendar) && ($calendar != '')) {