Notice fixes. Props DD32. see WordPress#7509

ryanboren · ryanboren · commit 3a7e85c5ecc6 · 2008-11-15T17:56:44.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@9714 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-admin/edit-attachment-rows.php b/wp-admin/edit-attachment-rows.php
@@ -24,7 +24,6 @@
 	<tbody id="the-list" class="list:post">
 <?php
 if ( have_posts() ) {
-$bgcolor = '';
 add_filter('the_title','wp_specialchars');
 while (have_posts()) : the_post();
 $alt = ( 'alternate' == $alt ) ? '' : 'alternate';
@@ -200,7 +199,7 @@
 endwhile;
 } else {
 ?>
-  <tr style='background-color: <?php echo $bgcolor; ?>'>
+  <tr>
     <td colspan="8"><?php _e('No posts found.') ?></td>
   </tr>
 <?php
diff --git a/wp-includes/post.php b/wp-includes/post.php
@@ -1899,7 +1899,8 @@ function &get_page(&$page, $output = OBJECT, $filter = 'raw') {
 		}
 	}
 
-	return get_post($page, $output, $filter);
+	$page = get_post($page, $output, $filter);
+	return $page;
 }
 
 /**
diff --git a/wp-includes/query.php b/wp-includes/query.php
@@ -1740,21 +1740,21 @@ function &get_posts() {
 		if ( !empty($q['s']) ) {
 			// 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) {
 				$term = addslashes_gpc($term);
 				$search .= "{$searchand}(($wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}'))";
 				$searchand = ' AND ';
 			}
 			$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}')";
 
 			if ( !empty($search) )
diff --git a/wp-includes/rss.php b/wp-includes/rss.php
@@ -538,12 +538,17 @@ function fetch_rss ($url) {
 function _fetch_remote_file ($url, $headers = "" ) {
 	$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'];
 

Original file line number	Diff line number	Diff line change
`@@ -1899,7 +1899,8 @@ function &get_page(&$page, $output = OBJECT, $filter = 'raw') {`
`1899`	`1899`	`}`
`1900`	`1900`	`}`
`1901`	`1901`
`1902`		`- return get_post($page, $output, $filter);`
	`1902`	`+ $page = get_post($page, $output, $filter);`
	`1903`	`+ return $page;`
`1903`	`1904`	`}`
`1904`	`1905`
`1905`	`1906`	`/**`