WP Merge to rev 4185

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

4 files changed, 19 insertions, 7 deletions

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 0f5cc74..6094dcb 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -741,7 +741,7 @@ function human_time_diff( $from, $to = '' ) {
 function wp_trim_excerpt($text) { // Fakes an excerpt if needed
 	global $post;
 	if ( '' == $text ) {
-		$text = $post->post_content;
+		$text = get_the_content('');
 		$text = apply_filters('the_content', $text);
 		$text = str_replace(']]>', ']]>', $text);
 		$text = strip_tags($text);
diff --git a/wp-includes/js/autosave.js.php b/wp-includes/js/autosave.js.php
index 4db6ff9..cbd8e57 100644
--- a/wp-includes/js/autosave.js.php
+++ b/wp-includes/js/autosave.js.php
@@ -103,6 +103,10 @@ function autosave() {
 	autosaveAjax.setVar("post_ID", $("post_ID").value);
 	autosaveAjax.setVar("post_title", form.post_title.value);
 	autosaveAjax.setVar("post_type", form.post_type.value);
+	if ( form.comment_status.checked )
+		autosaveAjax.setVar("comment_status", 'open');
+	if ( form.ping_status.checked )
+		autosaveAjax.setVar("ping_status", 'open');
 	if(form.excerpt)
 		autosaveAjax.setVar("excerpt", form.excerpt.value);		
 		
diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index 8207720..f0d1eab 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -82,7 +82,7 @@ function get_the_content($more_link_text = '(more...)', $stripteaser = 0, $more_
 	$content = $pages[$page-1];
 	if ( preg_match('/<!--more(.+?)?-->/', $content, $matches) ) {
 		$content = explode($matches[0], $content, 2);
-		if ( !empty($matches[1]) )
+		if ( !empty($matches[1]) && !empty($more_link_text) )
 			$more_link_text = strip_tags(wp_kses_no_null(trim($matches[1])));
 	} else {
 		$content = array($content);
@@ -94,10 +94,14 @@ function get_the_content($more_link_text = '(more...)', $stripteaser = 0, $more_
 		$teaser = '';
 	$output .= $teaser;
 	if ( count($content) > 1 ) {
-		if ( $more )
+		if ( $more ) {
 			$output .= '<a id="more-'.$id.'"></a>'.$content[1];
-		else
-			$output = balanceTags($output . ' <a href="'. get_permalink() . "#more-$id\">$more_link_text</a>");
+		} else {
+			$output = balanceTags($output);
+			if ( ! empty($more_link_text) )
+				$output .= ' <a href="'. get_permalink() . "#more-$id\">$more_link_text</a>";
+		}
+			
 	}
 	if ( $preview ) // preview fix for javascript bug with foreign languages
 		$output =	preg_replace('/\%u([0-9A-F]{4,4})/e',	"'&#'.base_convert('\\1',16,10).';'", $output);
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index d5a8986..9dd8ffc 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -66,7 +66,8 @@ class WP_Scripts {
 				if ( isset($this->args[$handle]) )
 					$ver .= '&amp;' . $this->args[$handle];
 				$src = 0 === strpos($this->scripts[$handle]->src, 'http://') ? $this->scripts[$handle]->src : get_option( 'siteurl' ) . $this->scripts[$handle]->src;
-				echo "<script type='text/javascript' src='$src?ver=$ver'></script>\n";
+				$src = add_query_arg('ver', $ver, $src);
+				echo "<script type='text/javascript' src='$src'></script>\n";
 				$this->printed[] = $handle;
 			}
 		}
@@ -132,7 +133,10 @@ class WP_Scripts {
 		foreach ( (array) $handles as $handle ) {
 			$handle = explode('?', $handle);
 			if ( !in_array($handle[0], $this->queue) && isset($this->scripts[$handle[0]]) ) {
-				$this->queue[] = $handle[0];
+				if ( 'wp_tiny_mce' == $handle[0] ) // HACK: Put tinyMCE first.
+					array_unshift($this->queue, $handle[0]);
+				else
+					$this->queue[] = $handle[0];
 				if ( isset($handle[1]) )
 					$this->args[$handle[0]] = $handle[1];
 			}