WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@502 7be80a69-a1ef-0310-a953-fb0f7c49ff36

3 files changed, 7 insertions, 6 deletions

diff --git a/wp-inst/wp-admin/post.php b/wp-inst/wp-admin/post.php
index 6976f45..a5b18f0 100644
--- a/wp-inst/wp-admin/post.php
+++ b/wp-inst/wp-admin/post.php
@@ -74,8 +74,6 @@ case 'edit':
 	
 	if ($post->post_status == 'static')
 		include('edit-page-form.php');
-	elseif ($post->post_status == 'attachment')
-		include('edit-attachment-form.php');
 	else
 		include('edit-form-advanced.php');
 
diff --git a/wp-inst/wp-includes/classes.php b/wp-inst/wp-includes/classes.php
index 5628797..6226bf4 100644
--- a/wp-inst/wp-includes/classes.php
+++ b/wp-inst/wp-includes/classes.php
@@ -5,6 +5,7 @@ class WP_Query {
 	var $query_vars;
 	var $queried_object;
 	var $queried_object_id;
+	var $request;
 
 	var $posts;
 	var $post_count = 0;
@@ -257,7 +258,7 @@ class WP_Query {
 	}
 
 	function &get_posts() {
-		global $wpdb, $pagenow, $request, $user_ID;
+		global $wpdb, $pagenow, $user_ID;
 
 		do_action('pre_get_posts', array(&$this));
 
@@ -643,9 +644,9 @@ class WP_Query {
 		$orderby = "post_" . $q['orderby'];
 		$orderby = apply_filters('posts_orderby', $orderby); 
 		$request = " SELECT $distinct * FROM $wpdb->posts $join WHERE 1=1" . $where . " GROUP BY " . $groupby . " ORDER BY " . $orderby . " $limits";
-		$request = apply_filters('posts_request', $request);
+		$this->request = apply_filters('posts_request', $request);
 
-		$this->posts = $wpdb->get_results($request);
+		$this->posts = $wpdb->get_results($this->request);
 
 		// Check post status to determine if post should be displayed.
 		if ($this->is_single) {
@@ -1667,6 +1668,7 @@ class WP {
 		$GLOBALS['query_string'] = & $this->query_string;
 		$GLOBALS['posts'] = & $wp_query->posts;
 		$GLOBALS['post'] = & $wp_query->post;
+		$GLOBALS['request'] = & $wp_query->request;
 
 		if ( is_single() || is_page() ) {
 			$GLOBALS['more'] = 1;
diff --git a/wp-inst/wp-includes/comment-functions.php b/wp-inst/wp-includes/comment-functions.php
index 96ab537..7bbbaac 100644
--- a/wp-inst/wp-includes/comment-functions.php
+++ b/wp-inst/wp-includes/comment-functions.php
@@ -634,10 +634,11 @@ function pingback($content, $post_ID) {
 				$post_links[] = $link_test;
 			elseif(($test['path'] != '/') && ($test['path'] != ''))
 				$post_links[] = $link_test;
-			do_action('pre_ping',  array(&$post_links, &$pung));
 		endif;
 	endforeach;
 
+	do_action('pre_ping',  array(&$post_links, &$pung));
+
 	foreach ($post_links as $pagelinkedto){
 		debug_fwrite($log, "Processing -- $pagelinkedto\n");
 		$pingback_server_url = discover_pingback_server_uri($pagelinkedto, 2048);