summaryrefslogtreecommitdiffstats
path: root/wp-includes/js
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-06-30 08:36:17 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-06-30 08:36:17 +0000
commit3ee2661aeb601a93b99fbbef43d10b802788c3bc (patch)
treec053c89fcb9099ccb6aa9d15aa4efc9aa0a664ce /wp-includes/js
parent91046d263bd61bc63c06ba6b5930042e01a79bfb (diff)
downloadwordpress-mu-3ee2661aeb601a93b99fbbef43d10b802788c3bc.tar.gz
wordpress-mu-3ee2661aeb601a93b99fbbef43d10b802788c3bc.tar.xz
wordpress-mu-3ee2661aeb601a93b99fbbef43d10b802788c3bc.zip
WP Merge (kill the foo!)
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@618 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/js')
-rw-r--r--wp-includes/js/tinymce/tiny_mce_gzip.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/wp-includes/js/tinymce/tiny_mce_gzip.php b/wp-includes/js/tinymce/tiny_mce_gzip.php
index e975389..d92e08e 100644
--- a/wp-includes/js/tinymce/tiny_mce_gzip.php
+++ b/wp-includes/js/tinymce/tiny_mce_gzip.php
@@ -44,7 +44,7 @@ function wp_tinymce_lang($path) {
$replace1 = "'tinyMCELang[\\1\\2\\1]\\3'.stripslashes('\\4').__('\\5').stripslashes('\\4')";
$search2 = "/\\s:\\s(['\"])(.*)\\1(,|\\s*})/Uem";
- $replace2 = "' : '.stripslashes('\\1').__('\\2foo').stripslashes('\\1').'\\3'";
+ $replace2 = "' : '.stripslashes('\\1').__('\\2').stripslashes('\\1').'\\3'";
$search = array($search1, $search2);
$replace = array($replace1, $replace2);