From be987907b8e1e8add8f74c986c5af80f7668b341 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Sun, 29 May 2011 21:18:58 +0000 Subject: [PATCH] Improve JS array/object detection when outputting the TinyMCE init array. git-svn-id: https://develop.svn.wordpress.org/trunk@18071 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/post.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index bd67fcd9ed..7b23e54559 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -1649,7 +1649,7 @@ function wp_tiny_mce( $teeny = false, $settings = false ) { $val = $v ? 'true' : 'false'; $mce_options .= $k . ':' . $val . ', '; continue; - } elseif ( !empty($v) && is_string($v) && ( '{' == $v{0} || '[' == $v{0} || preg_match('/^\(?function ?\(/', $v) ) ) { + } elseif ( is_string($v) && ( ('{' == $v{0} && '}' == $v{strlen($v) - 1}) || ('[' == $v{0} && ']' == $v{strlen($v) - 1}) || preg_match('/^\(?function ?\(/', $v) ) ) { $mce_options .= $k . ':' . $v . ', '; continue; }