Changeset 9714

Timestamp:

11/15/2008 05:56:44 PM (17 years ago)

Author:

ryan

Message:

Notice fixes. Props DD32. see #7509

Location:

trunk

Files:

• wp-admin/edit-attachment-rows.php (modified) (2 diffs)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/query.php (modified) (2 diffs)
• wp-includes/rss.php (modified) (1 diff)

trunk/wp-admin/edit-attachment-rows.php

@@ -25 +25 @@
 <?php
 if ( have_posts() ) {
-$bgcolor = '';
 add_filter('the_title','wp_specialchars');
 while (have_posts()) : the_post();
@@ -201 +200 @@
 } else {
 ?>
-  <tr style='background-color: <?php echo $bgcolor; ?>'>
+  <tr>
     <td colspan="8"><?php _e('No posts found.') ?></td>
   </tr>

trunk/wp-includes/post.php

@@ -1900 +1900 @@
     }
 
-    return get_post($page, $output, $filter);
+    $page = get_post($page, $output, $filter);
+    return $page;
 }
 

trunk/wp-includes/query.php

@@ -1741 +1741 @@
             // added slashes screw with quote grouping when done early, so done later
             $q['s'] = stripslashes($q['s']);
-            if ($q['sentence']) {
+            if ( !empty($q['sentence']) ) {
                 $q['search_terms'] = array($q['s']);
             } else {
-                preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $q[s], $matches);
+                preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $q['s'], $matches);
                 $q['search_terms'] = array_map(create_function('$a', 'return trim($a, "\\"\'\\n\\r ");'), $matches[0]);
             }
-            $n = ($q['exact']) ? '' : '%';
+            $n = !empty($q['exact']) ? '' : '%';
             $searchand = '';
             foreach( (array) $q['search_terms'] as $term) {
@@ -1755 +1755 @@
             }
             $term = $wpdb->escape($q['s']);
-            if (!$q['sentence'] && count($q['search_terms']) > 1 && $q['search_terms'][0] != $q['s'] )
+            if (empty($q['sentence']) && count($q['search_terms']) > 1 && $q['search_terms'][0] != $q['s'] )
                 $search .= " OR ($wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}')";
 

trunk/wp-includes/rss.php

@@ -539 +539 @@
     $resp = wp_remote_request($url, array('headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT));
     if ( is_wp_error($resp) ) {
+        $error = array_shift($resp->errors);
+
         $resp = new stdClass;
         $resp->status = 500;
+        $resp->response_code = 500;
+        $resp->error = $error[0] . "\n"; //\n = Snoopy compatibility
         return $resp;
     }
     $response = new stdClass;
     $response->status = $resp['response']['code'];
+    $response->response_code = $resp['response']['code'];
     $response->headers = $resp['headers'];
     $response->results = $resp['body'];