diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-12-07 16:58:13 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-12-07 16:58:13 +0000 |
| commit | f9d5ef9fbb062b0c44c09207f947b515ab6dc66e (patch) | |
| tree | d1cfa030e80a5f08ac79fb21281e647ee8a86026 /wp-includes/general-template.php | |
| parent | d3ac809ed8a43bde6ea954329b3291fd9ca4aad5 (diff) | |
| download | wordpress-mu-f9d5ef9fbb062b0c44c09207f947b515ab6dc66e.tar.gz wordpress-mu-f9d5ef9fbb062b0c44c09207f947b515ab6dc66e.tar.xz wordpress-mu-f9d5ef9fbb062b0c44c09207f947b515ab6dc66e.zip | |
WP Merge to rev 4626
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@821 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/general-template.php')
| -rw-r--r-- | wp-includes/general-template.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index cb80691..60fce25 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -787,10 +787,10 @@ function rich_edit_exists() { } function user_can_richedit() { - global $wp_rich_edit; - + global $wp_rich_edit, $pagenow; + if ( !isset($wp_rich_edit) ) - $wp_rich_edit = ( 'true' == get_user_option('rich_editing') && !preg_match('!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT']) && rich_edit_exists() ) ? true : false; + $wp_rich_edit = ( 'true' == get_user_option('rich_editing') && !preg_match('!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT']) && 'comment.php' != $pagenow && rich_edit_exists() ) ? true : false; return apply_filters('user_can_richedit', $wp_rich_edit); } |