WP Merge

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

2 files changed, 9 insertions, 6 deletions

diff --git a/wp-includes/js/tinymce/plugins/spellchecker/config.php b/wp-includes/js/tinymce/plugins/spellchecker/config.php
index a528565..2bfc9ec 100755
--- a/wp-includes/js/tinymce/plugins/spellchecker/config.php
+++ b/wp-includes/js/tinymce/plugins/spellchecker/config.php
@@ -6,7 +6,7 @@
 

 	// Pspell shell specific settings

 	$spellCheckerConfig['tinypspellshell.aspell'] = '/usr/bin/aspell';

-	$spellCheckerConfig['tinypspellshell.tmp'] = '/tmp';

+	$spellCheckerConfig['tinypspellshell.tmp'] = '/tmp/tinyspell/0';

 

 	// Default settings

 	$spellCheckerConfig['default.language'] = 'en';

diff --git a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js
index 733b4c2..08529ec 100644
--- a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js
+++ b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js
@@ -149,12 +149,14 @@ var TinyMCE_wordpressPlugin = {
 				var altPage = tinyMCE.getLang('lang_wordpress_page_alt');
 
 				// Parse all <!--more--> tags and replace them with images
-				while ((startPos = content.indexOf('<!--more-->', startPos)) != -1) {
+				while ((startPos = content.indexOf('<!--more', startPos)) != -1) {
+					var endPos = content.indexOf('-->', startPos) + 3;
 					// Insert image
-					var contentAfter = content.substring(startPos + 11);
+					var moreText = content.substring(startPos + 8, endPos - 3);
+					var contentAfter = content.substring(endPos);
 					content = content.substring(0, startPos);
 					content += '<img src="' + (tinyMCE.getParam("theme_href") + "/images/spacer.gif") + '" ';
-					content += ' width="100%" height="10px" ';
+					content += ' width="100%" height="10px" moretext="'+moreText+'" ';
 					content += 'alt="'+altMore+'" title="'+altMore+'" class="mce_plugin_wordpress_more" name="mce_plugin_wordpress_more" />';
 					content += contentAfter;
 
@@ -200,7 +202,8 @@ var TinyMCE_wordpressPlugin = {
 					if (attribs['class'] == "mce_plugin_wordpress_more" || attribs['name'] == "mce_plugin_wordpress_more") {
 						endPos += 2;
 
-						var embedHTML = '<!--more-->';
+						var moreText = attribs['moretext'] ? attribs['moretext'] : '';
+						var embedHTML = '<!--more'+moreText+'-->';
 
 						// Insert embed/object chunk
 						chunkBefore = content.substring(0, startPos);
@@ -342,7 +345,7 @@ var TinyMCE_wordpressPlugin = {
 				if (pos != -1)
 					attributeName = attributeName.substring(pos+1);
 
-				attributes[attributeName.toLowerCase()] = attributeValue.substring(1).toLowerCase();
+				attributes[attributeName.toLowerCase()] = attributeValue.substring(1);
 
 				attributeName = "";
 				attributeValue = "";