diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-09-22 09:43:00 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-09-22 09:43:00 +0000 |
| commit | 9e49a3e6447829ea9bca3f477f2a0a65fcaf7ede (patch) | |
| tree | f51eae7cd0f9039a92d305d7b98c7b7f6500d917 | |
| parent | 84b5146fc556bd79bfd9b00ec2530598fffb20d5 (diff) | |
| download | wordpress-mu-9e49a3e6447829ea9bca3f477f2a0a65fcaf7ede.tar.gz wordpress-mu-9e49a3e6447829ea9bca3f477f2a0a65fcaf7ede.tar.xz wordpress-mu-9e49a3e6447829ea9bca3f477f2a0a65fcaf7ede.zip | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@354 7be80a69-a1ef-0310-a953-fb0f7c49ff36
| -rw-r--r-- | wp-inst/wp-admin/admin-functions.php | 6 | ||||
| -rw-r--r-- | wp-inst/wp-includes/comment-functions.php | 2 | ||||
| -rw-r--r-- | wp-inst/wp-includes/kses.php | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/wp-inst/wp-admin/admin-functions.php b/wp-inst/wp-admin/admin-functions.php index 8d56c13..f648f5e 100644 --- a/wp-inst/wp-admin/admin-functions.php +++ b/wp-inst/wp-admin/admin-functions.php @@ -582,9 +582,11 @@ function wp_insert_link($linkdata) { $link_target = ''; if ( empty($link_visible) ) - $link_visible = 'Y'; + $link_visible = 'Y'; + + if ( empty($link_owner) ) + $link_owner = $current_user->id; - $link_owner = $current_user->id; if ( $update ) { $wpdb->query("UPDATE $wpdb->links SET link_url='$link_url', link_name='$link_name', link_image='$link_image', diff --git a/wp-inst/wp-includes/comment-functions.php b/wp-inst/wp-includes/comment-functions.php index 1bd0860..842135e 100644 --- a/wp-inst/wp-includes/comment-functions.php +++ b/wp-inst/wp-includes/comment-functions.php @@ -94,7 +94,7 @@ function wp_allow_comment($commentdata) { global $wpdb; extract($commentdata); - $comment_user_domain = apply_filters('pre_comment_user_domain', gethostbyaddr($comment_author_ip) ); + $comment_user_domain = apply_filters('pre_comment_user_domain', gethostbyaddr($comment_author_IP) ); // Simple duplicate check $dupe = "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = '$comment_post_ID' AND ( comment_author = '$comment_author' "; diff --git a/wp-inst/wp-includes/kses.php b/wp-inst/wp-includes/kses.php index b758f0e..0862c25 100644 --- a/wp-inst/wp-includes/kses.php +++ b/wp-inst/wp-includes/kses.php @@ -512,11 +512,10 @@ function wp_filter_kses($data) { function wp_filter_post_kses($data) { global $allowedposttags; - return addslashes( wp_kses(stripslashes( $data ), $allowedposttags) ); + return addslashes ( wp_kses(stripslashes( $data ), $allowedposttags) ); } function kses_init() { - global $current_user; add_filter('pre_comment_author', 'wp_filter_kses'); add_filter('pre_comment_content', 'wp_filter_kses'); |