Changeset 1235

Timestamp:

05/05/2004 09:29:23 PM (21 years ago)

Author:

saxmatt

Message:

Some E_ALL fixes.

Location:

trunk

Files:

• wp-blog-header.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/links.php (modified) (3 diffs)
• wp-includes/template-functions-category.php (modified) (3 diffs)
• wp-includes/template-functions-general.php (modified) (1 diff)
• wp-rss2.php (modified) (1 diff)

trunk/wp-blog-header.php

@@ -500 +500 @@
             
             // Force subkeys to be array type:
-            if (!is_array($post_meta_cache[$mpid]))
+            if (!isset($post_meta_cache[$mpid]) || !is_array($post_meta_cache[$mpid]))
                 $post_meta_cache[$mpid] = array();
-            if (!is_array($post_meta_cache[$mpid][$mkey]))
-                $post_meta_cache[$mpid][$mkey] = array();
+            if (!isset($post_meta_cache[$mpid]["$mkey"]) || !is_array($post_meta_cache[$mpid]["$mkey"]))
+                $post_meta_cache[$mpid]["$mkey"] = array();
             
             // Add a value to the current pid/key:

trunk/wp-includes/functions.php

@@ -164 +164 @@
     global $user_login, $userdata, $user_level, $user_ID, $user_nickname, $user_email, $user_url, $user_pass_md5, $cookiehash;
     // *** retrieving user's data from cookies and db - no spoofing
-    $user_login = $_COOKIE['wordpressuser_' . $cookiehash];
+
+    if (isset($_COOKIE['wordpressuser_' . $cookiehash])) 
+        $user_login = $_COOKIE['wordpressuser_' . $cookiehash];
     $userdata = get_userdatabylogin($user_login);
     $user_level = $userdata->user_level;

trunk/wp-includes/links.php

@@ -124 +124 @@
     if (get_settings('links_recently_updated_time')) {
         $recently_updated_test = ", IF (DATE_ADD(link_updated, INTERVAL ".get_settings('links_recently_updated_time')." MINUTE) >= NOW(), 1,0) as recently_updated ";
-    }
+    } else {
+        $recently_updated_test = '';
+    }
     if ($show_updated) {
         $get_updated = ", UNIX_TIMESTAMP(link_updated) AS link_updated_f ";
@@ -168 +170 @@
     }
     foreach ($results as $row) {
+        if (!isset($row->recently_updated)) $row->recently_updated = false;
         echo($before);
         if ($show_updated && $row->recently_updated) {
@@ -534 +537 @@
     $cat_order = ('name' == $order) ? 'cat_name' : 'cat_id';
 
-
-    // Fetch the link category data as an array of hashes
+    if (!isset($direction)) $direction = '';
+    // Fetch the link category data as an array of hashesa
     $cats = $wpdb->get_results("
         SELECT DISTINCT link_category, cat_name, show_images, 

trunk/wp-includes/template-functions-category.php

@@ -265 +265 @@
     }
 
+    $exclusions = '';
     if (!empty($exclude)) {
-        $exclusions = ''; // initialize for safety
         $excats = preg_split('/[\s,]+/',$exclude);
         if (count($excats)) {
@@ -327 +327 @@
     
     foreach ($categories as $category) {
-        if ((intval($hide_empty) == 0 || $category_posts["$category->cat_ID"] > 0) && (!$children || $category->category_parent == $child_of)) {
+        if ((intval($hide_empty) == 0 || isset($category_posts["$category->cat_ID"])) && (!$children || $category->category_parent == $child_of)) {
             $num_found++;
             $link = '<a href="'.get_category_link(0, $category->cat_ID, $category->category_nicename).'" ';
@@ -396 +396 @@
         $pre = "\t\t<ul class='children'>";
         $post = "\t\t</ul>\n";
-    }
-    $thelist=$pre.$thelist.$post;
+    } else {
+        $pre = $post = '';
+    }
+    $thelist = $pre . $thelist . $post;
     if ($recurse) {
         return $thelist;

trunk/wp-includes/template-functions-general.php

@@ -442 +442 @@
             }
             if (empty($ak_titles_for_day["$ak_post_title->dom"])) { // first one
-                $ak_titles_for_day["$ak_post_title->dom"] .= htmlspecialchars(stripslashes($ak_post_title->post_title));
+                $ak_titles_for_day["$ak_post_title->dom"] = htmlspecialchars(stripslashes($ak_post_title->post_title));
             } else {
                 $ak_titles_for_day["$ak_post_title->dom"] .= $ak_title_separator . htmlspecialchars(stripslashes($ak_post_title->post_title));

trunk/wp-rss2.php

@@ -1 +1 @@
 <?php 
-if (! $feed) {
+if (!isset($feed)) {
     $blog = 1;
     $doing_rss = 1;