WP Merge to 4559

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

4 files changed, 9 insertions, 9 deletions

diff --git a/wp-includes/js/autosave.js.php b/wp-includes/js/autosave.js.php
index 2e76230..934bfa0 100644
--- a/wp-includes/js/autosave.js.php
+++ b/wp-includes/js/autosave.js.php
@@ -38,9 +38,9 @@ function autosave_update_post_ID() {
 	var message;
 	
 	if(isNaN(res)) {
-		message = "<?php _e('Error: '); ?>" + response;
+		message = "<?php js_escape(__('Error: ')); ?>" + response;
 	} else {
-		message = "<?php _e('Saved at '); ?>" + autosave_cur_time();
+		message = "<?php js_escape(__('Saved at ')); ?>" + autosave_cur_time();
 		$('post_ID').name = "post_ID";
 		$('post_ID').value = res;
 		// We need new nonces
@@ -60,7 +60,7 @@ function autosave_update_post_ID() {
 }
 
 function autosave_loading() {
-	$('autosave').innerHTML = "<?php _e('Saving Draft...'); ?>";
+	$('autosave').innerHTML = "<?php js_escape(__('Saving Draft...')); ?>";
 }
 
 function autosave_saved() {
@@ -69,9 +69,9 @@ function autosave_saved() {
 	var message;
 	
 	if(isNaN(res)) {
-		message = "<?php _e('Error: '); ?>" + response;
+		message = "<?php js_escape(__('Error: ')); ?>" + response;
 	} else {
-		message = "<?php _e('Saved at '); ?>" + autosave_cur_time() + ".";
+		message = "<?php js_escape(__('Saved at ')); ?>" + autosave_cur_time() + ".";
 	}
 	$('autosave').innerHTML = message;
 }
diff --git a/wp-includes/js/list-manipulation-js.php b/wp-includes/js/list-manipulation-js.php
index 112d19f..eb67077 100644
--- a/wp-includes/js/list-manipulation-js.php
+++ b/wp-includes/js/list-manipulation-js.php
@@ -1,6 +1,6 @@
 <?php @require_once('../../wp-config.php'); cache_javascript_headers(); ?>
 addLoadEvent(function(){theList=new listMan();});
-function deleteSomething(what,id,message,obj){if(!obj)obj=theList;if(!message)message="<?php printf(__('Are you sure you want to delete this %s?'),"'+what+'"); ?>";if(confirm(message))return obj.ajaxDelete(what,id);else return false;}
+function deleteSomething(what,id,message,obj){if(!obj)obj=theList;if(!message)message="<?php printf(js_escape(__('Are you sure you want to delete this %s?')),"'+what+'"); ?>";if(confirm(message))return obj.ajaxDelete(what,id);else return false;}
 function dimSomething(what,id,dimClass,obj){if(!obj)obj=theList;return obj.ajaxDimmer(what,id,dimClass);}
 
 var listMan = Class.create();
@@ -47,7 +47,7 @@ Object.extend(listMan.prototype, {
 					if ( tempObj.showLink )
 						tempObj.showLink = id;
 				});
-				ajaxAdd.myResponseElement.update(tempObj.showLink ? ( "<div id='jumplink' class='updated fade'><p><a href='#" + what + '-' + tempObj.showLink + "'><?php _e('Jump to new item'); ?></a></p></div>" ) : '');
+				ajaxAdd.myResponseElement.update(tempObj.showLink ? ( "<div id='jumplink' class='updated fade'><p><a href='#" + what + '-' + tempObj.showLink + "'><?php js_escape(__('Jump to new item')); ?></a></p></div>" ) : '');
 			}
 			if ( tempObj.addComplete && typeof tempObj.addComplete == 'function' )
 				tempObj.addComplete( what, where, update, transport );
diff --git a/wp-includes/js/tinymce/wp-mce-help.php b/wp-includes/js/tinymce/wp-mce-help.php
index d9d376b..2daf7ef 100644
--- a/wp-includes/js/tinymce/wp-mce-help.php
+++ b/wp-includes/js/tinymce/wp-mce-help.php
@@ -164,7 +164,7 @@
 
 <div id="content4" class="hidden">
 	<h2><?php _e('About TinyMCE'); ?></h2>
-	<p><?php printf(__('Version: %s'), '2.0RC4') ?></p>
+	<p><?php printf(__('Version: %s'), '2.0.8') ?></p>
 	<p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under %sLGPL</a>	by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.get_bloginfo('home').'/wp-includes/js/tinymce/license.txt" target="_blank" title="'.__('GNU Library General Public Licence').'">') ?></p>
 	<p><?php _e('Copyright &copy; 2005, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.') ?></p>
 	<p><?php _e('For more information about this software visit the <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE website</a>.') ?></p>
diff --git a/wp-includes/js/wp-ajax-js.php b/wp-includes/js/wp-ajax-js.php
index 0d4cf2b..3bb32ce 100644
--- a/wp-includes/js/wp-ajax-js.php
+++ b/wp-includes/js/wp-ajax-js.php
@@ -81,7 +81,7 @@ Ajax.Responders.register( {
 			return;
 		wpBeforeUnload = window.onbeforeunload;
 		window.onbeforeunload = function() {
-			return "<?php _e("Slow down, I'm still sending your data!"); ?>";
+			return "<?php js_escape(__("Slow down, I'm still sending your data!")); ?>";
 		}
 	},
 	onLoading: function() { // Can switch to onLoaded if we lose data