WP Merge

Display newest updated blogs on home page
Sidebar and footer: added links to signup and main blog


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

3 files changed, 11 insertions, 4 deletions

diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 71eb46b..bb77ae0 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -216,8 +216,12 @@ if ( ! empty($pings) )
 </fieldset>
 </div>
 
+<div class="dbx-box-wrapper">
 <fieldset id="postcustom" class="dbx-box">
+<div class="dbx-handle-wrapper">
 <h3 class="dbx-handle"><?php _e('Custom Fields') ?></h3>
+</div>
+<div class="dbx-content-wrapper">
 <div id="postcustomstuff" class="dbx-content">
 <table cellpadding="3">
 <?php
@@ -232,6 +236,7 @@ list_meta($metadata);
 <div id="ajax-response"></div>
 </div>
 </fieldset>
+</div>
 
 <?php do_action('dbx_post_advanced'); ?>
 
diff --git a/wp-admin/list-manipulation-js.php b/wp-admin/list-manipulation-js.php
index b767a76..8711b28 100644
--- a/wp-admin/list-manipulation-js.php
+++ b/wp-admin/list-manipulation-js.php
@@ -29,9 +29,6 @@ function WPAjax(file, responseEl){//class WPAjax extends sack
 	WPAjax.prototype.init=function(f,r){
 		this.encVar('cookie', document.cookie);
 		this.requestFile=f?f:'<?php echo $handler; ?>';this.getResponseElement(r);this.method='POST';
-		this.onLoading=function(){this.myResponseElement.innerHTML="<?php _e('Sending Data...'); ?>";};
-		this.onLoaded=function(){this.myResponseElement.innerHTML="<?php _e('Data Sent...'); ?>";};
-		this.onInteractive=function(){this.myResponseElement.innerHTML="<?php _e('Processing Data...'); ?>";};
 	}
 
 function listMan(theListId){
diff --git a/wp-admin/post.php b/wp-admin/post.php
index 62abfe9..a5046d1 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -93,13 +93,18 @@ case 'editpost':
 	
 	$post_ID = edit_post();
 
+	$referredby = '';
+	if ( !empty($_POST['referredby']) )
+		$referredby = preg_replace('|https?://[^/]+|i', '', $_POST['referredby']);
+	$referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer());
+	
 	if ($_POST['save']) {
 		$location = wp_get_referer();
 	} elseif ($_POST['updatemeta']) {
 		$location = wp_get_referer() . '&message=2#postcustom';
 	} elseif ($_POST['deletemeta']) {
 		$location = wp_get_referer() . '&message=3#postcustom';
-	} elseif (!empty($_POST['referredby']) && $_POST['referredby'] != wp_get_referer()) {
+	} elseif (!empty($referredby) && $referredby != $referer) {
 		$location = $_POST['referredby'];
 		if ( $_POST['referredby'] == 'redo' )
 			$location = get_permalink( $post_ID );