WP Merge

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

5 files changed, 29 insertions, 15 deletions

diff --git a/wp-inst/wp-admin/admin-footer.php b/wp-inst/wp-admin/admin-footer.php
index c7bbee5..3df83a5 100644
--- a/wp-inst/wp-admin/admin-footer.php
+++ b/wp-inst/wp-admin/admin-footer.php
@@ -6,7 +6,6 @@
 </p>
 
 </div>
-<?php check_for_pings(); ?>
 <?php do_action('admin_footer', ''); ?>
 <script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
 </body>
diff --git a/wp-inst/wp-admin/admin-header.php b/wp-inst/wp-admin/admin-header.php
index 7ac2a48..15ae0b1 100644
--- a/wp-inst/wp-admin/admin-header.php
+++ b/wp-inst/wp-admin/admin-header.php
@@ -83,9 +83,20 @@ addLoadEvent(blurry);
 <script type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce_gzip.php?ver=20051211"></script>
 <?php endif; ?>
 <script type="text/javascript" src="../wp-includes/js/dbx.js"></script>
+<script type="text/javascript">
+//<![CDATA[
+	addLoadEvent( function() {
+<?php switch ( $pagenow ) : case 'post.php' : ?>
+        var manager = new dbxManager('postmeta');       //session ID [/-_a-zA-Z0-9/]
+<?php break; case 'page-new.php' : ?>
+        var manager = new dbxManager('pagemeta');       //session ID [/-_a-zA-Z0-9/]
+<?php break; endswitch; ?>
+	});
+//]]>
+</script>
 <script type="text/javascript" src="../wp-includes/js/dbx-key.js"></script>
 
-<?php if ( isset($editing) && current_user_can('manage_categories') ) : ?>
+<?php if ( current_user_can('manage_categories') ) : ?>
 <style type="text/css">
 #newcat { width: 120px; margin-right: 5px; }
 input#catadd { 	background: #a4a4a4;
@@ -113,6 +124,7 @@ input#catadd { 	background: #a4a4a4;
 }
 </style>
 <script type="text/javascript">
+//<![CDATA[
 var ajaxCat = new sack();
 var newcat;
  
@@ -245,8 +257,6 @@ function newCatCompletion() {
 	}
 	p.parentNode.removeChild(p);
 //	var id = parseInt(ajaxCat.response, 10);
-
-
 }
 
 function ajaxNewCatKeyPress(e) {
@@ -302,6 +312,7 @@ function myPload( str ) {
 		fixedExplode[count] = currentElement;
 	return fixedExplode;
 }
+//]]>
 </script>
 <?php endif; ?>
 
diff --git a/wp-inst/wp-admin/execute-pings.php b/wp-inst/wp-admin/execute-pings.php
index 69811f7..10be97b 100644
--- a/wp-inst/wp-admin/execute-pings.php
+++ b/wp-inst/wp-admin/execute-pings.php
@@ -1,10 +1,6 @@
 <?php
-require_once('admin.php');
+require_once('../wp-config.php');
 
-if ( ! current_user_can('edit_posts') )
-	die (__("Cheatin' uh?"));
-
-echo '/* No Styles Here */';
 register_shutdown_function('execute_all_pings');
 //execute_all_pings();
 
@@ -14,7 +10,7 @@ function execute_all_pings() {
 	if($pings = $wpdb->get_results("SELECT * FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_pingme';")) {
 		foreach($pings as $ping) {
 			pingback($ping->post_content, $ping->ID);
-			//echo "Pingback: $ping->post_title : $ping->ID<br/>";
+			echo "Pingback: $ping->post_title : $ping->ID<br/>";
 			$wpdb->query("DELETE FROM {$wpdb->postmeta} WHERE post_id = {$ping->ID} AND meta_key = '_pingme';");
 		}
 	}
@@ -22,16 +18,19 @@ function execute_all_pings() {
 	if($enclosures = $wpdb->get_results("SELECT * FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_encloseme';")) {
 		foreach($enclosures as $enclosure) {
 			do_enclose($enclosure->post_content, $enclosure->ID);
-			//echo "Enclosure: $enclosure->post_title : $enclosure->ID<br/>";
+			echo "Enclosure: $enclosure->post_title : $enclosure->ID<br/>";
 			$wpdb->query("DELETE FROM {$wpdb->postmeta} WHERE post_id = {$enclosure->ID} AND meta_key = '_encloseme';");
 		}
 	}
 	// Do Trackbacks
 	if($trackbacks = $wpdb->get_results("SELECT ID FROM $wpdb->posts WHERE TRIM(to_ping) != '' AND post_status != 'draft'")) {
 		foreach($trackbacks as $trackback) {
-			//echo "trackback : $trackback->ID<br/>";
+			echo "Trackback : $trackback->ID<br/>";
 			do_trackbacks($trackback->ID);
 		}
 	}
 }
+
+_e('Done.');
+
 ?>
diff --git a/wp-inst/wp-admin/post.php b/wp-inst/wp-admin/post.php
index ea53a07..e3456b6 100644
--- a/wp-inst/wp-admin/post.php
+++ b/wp-inst/wp-admin/post.php
@@ -136,8 +136,13 @@ case 'delete':
 	if ( !current_user_can('edit_post', $post_id) )	
 		die( __('You are not allowed to delete this post.') );
 
-	if ( (($post->post_status != 'attachment') && !wp_delete_post($post_id)) || !wp_delete_attachment($post_id))
-		die( __('Error in deleting...') );
+	if ( $post->post_status == 'attachment' ) {
+		if ( ! wp_delete_attachment($post_id) )
+			die( __('Error in deleting...') );
+	} else {
+		if ( !wp_delete_post($post_id) ) 
+			die( __('Error in deleting...') );
+	}
 
 	$sendback = $_SERVER['HTTP_REFERER'];
 	if (strstr($sendback, 'post.php')) $sendback = get_settings('siteurl') .'/wp-admin/post.php';
diff --git a/wp-inst/wp-admin/profile.php b/wp-inst/wp-admin/profile.php
index f612c3a..4d71e7c 100644
--- a/wp-inst/wp-admin/profile.php
+++ b/wp-inst/wp-admin/profile.php
@@ -39,7 +39,7 @@ $bookmarklet_height= 440;
 <p><label><?php _e('Nickname:') ?><br />
 <input type="text" name="nickname" value="<?php echo $profileuser->nickname ?>" /></label></p>
 
-</p><label><?php _e('Display name publicly as:') ?> <br />
+<p><label><?php _e('Display name publicly as:') ?> <br />
 <select name="display_name">
 <option value="<?php echo $profileuser->display_name; ?>"><?php echo $profileuser->display_name; ?></option>
 <option value="<?php echo $profileuser->nickname ?>"><?php echo $profileuser->nickname ?></option>