summaryrefslogtreecommitdiffstats
path: root/wp-includes/general-template.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-08-06 09:35:24 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-08-06 09:35:24 +0000
commitd407afd2cf84fa1d87be4dd387cdb6539aac3112 (patch)
tree3b87936604a68a81cfcca74af607c5108d535142 /wp-includes/general-template.php
parentf7904d143986a96e6f209b51b380ad1ee640cad5 (diff)
downloadwordpress-mu-d407afd2cf84fa1d87be4dd387cdb6539aac3112.tar.gz
wordpress-mu-d407afd2cf84fa1d87be4dd387cdb6539aac3112.tar.xz
wordpress-mu-d407afd2cf84fa1d87be4dd387cdb6539aac3112.zip
Sync for WP 2.2.2
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1013 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/general-template.php')
-rw-r--r--wp-includes/general-template.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index bdc5b04..7c3c5f3 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -814,7 +814,8 @@ function user_can_richedit() {
if ( !isset( $wp_rich_edit) ) {
if ( get_user_option( 'rich_editing' ) == 'true' &&
( ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval($match[1]) >= 420 ) ||
- !preg_match( '!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT'] ) ) ) {
+ !preg_match( '!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT'] ) )
+ && 'comment.php' != $pagenow ) {
$wp_rich_edit = true;
} else {
$wp_rich_edit = false;