diff --git a/wp-admin/admin-db.php b/wp-admin/admin-db.php index 6f57a1005..37650ea51 100644 --- a/wp-admin/admin-db.php +++ b/wp-admin/admin-db.php @@ -293,23 +293,55 @@ function wp_insert_link($linkdata) { extract($linkdata); $update = false; + if ( !empty($link_id) ) $update = true; + if( trim( $link_name ) == '' ) + return 0; + $link_name = apply_filters('pre_link_name', $link_name); + + if( trim( $link_url ) == '' ) + return 0; + $link_url = apply_filters('pre_link_url', $link_url); + if ( empty($link_rating) ) $link_rating = 0; + else + $link_rating = (int) $link_rating; + + if ( empty($link_image) ) + $link_image = ''; + $link_image = apply_filters('pre_link_image', $link_image); if ( empty($link_target) ) $link_target = ''; + $link_target = apply_filters('pre_link_target', $link_target); if ( empty($link_visible) ) $link_visible = 'Y'; + $link_visibile = preg_replace('/[^YNyn]/', '', $link_visible); if ( empty($link_owner) ) $link_owner = $current_user->id; + else + $link_owner = (int) $link_owner; if ( empty($link_notes) ) $link_notes = ''; + $link_notes = apply_filters('pre_link_notes', $link_notes); + + if ( empty($link_description) ) + $link_description = ''; + $link_description = apply_filters('pre_link_description', $link_description); + + if ( empty($link_rss) ) + $link_rss = ''; + $link_rss = apply_filters('pre_link_rss', $link_rss); + + if ( empty($link_rel) ) + $link_rel = ''; + $link_rel = apply_filters('pre_link_rel', $link_rel); // Make sure we set a valid category if (0 == count($link_category) || !is_array($link_category)) { diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index c67fc65ac..7b4e17f55 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -301,6 +301,8 @@ function get_post_to_edit($id) { $post->post_title = format_to_edit($post->post_title); $post->post_title = apply_filters('title_edit_pre', $post->post_title); + $post->post_password = format_to_edit($post->post_password); + if ($post->post_type == 'page') $post->page_template = get_post_meta($id, '_wp_page_template', true); @@ -381,6 +383,23 @@ function wp_dropdown_roles( $default = false ) { } +function get_user_to_edit($user_id) { + $user = new WP_User($user_id); + $user->user_login = wp_specialchars($user->user_login, 1); + $user->user_email = wp_specialchars($user->user_email, 1); + $user->user_url = wp_specialchars($user->user_url, 1); + $user->first_name = wp_specialchars($user->first_name, 1); + $user->last_name = wp_specialchars($user->last_name, 1); + $user->display_name = wp_specialchars($user->display_name, 1); + $user->nickname = wp_specialchars($user->nickname, 1); + $user->aim = wp_specialchars($user->aim, 1); + $user->yim = wp_specialchars($user->yim, 1); + $user->jabber = wp_specialchars($user->jabber, 1); + $user->description = wp_specialchars($user->description); + + return $user; +} + // Creates a new user from the "Users" form using $_POST information. function add_user() { @@ -509,9 +528,11 @@ function get_link_to_edit($link_id) { $link->link_url = wp_specialchars($link->link_url, 1); $link->link_name = wp_specialchars($link->link_name, 1); - $link->link_description = wp_specialchars($link->link_description); + $link->link_image = wp_specialchars($link->link_image, 1); + $link->link_description = wp_specialchars($link->link_description, 1); $link->link_notes = wp_specialchars($link->link_notes); - $link->link_rss = wp_specialchars($link->link_rss); + $link->link_rss = wp_specialchars($link->link_rss, 1); + $link->link_rel = wp_specialchars($link->link_rel, 1); $link->post_category = $link->link_category; return $link; @@ -959,7 +980,7 @@ function list_meta($meta) { $style = ''; if ('_' == $entry['meta_key'] { 0 }) $style .= ' hidden'; - $key_js = addslashes(wp_specialchars( $entry['meta_key'], 'double' )); + $key_js = js_escape($entry['meta_key']); $entry['meta_key'] = wp_specialchars( $entry['meta_key'], true ); $entry['meta_value'] = wp_specialchars( $entry['meta_value'], true ); $r .= "\n\t
'. __('Already pinged:') . '
: | -+ |
wp-content/uploads'); ?> |
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 59a40f06e..2eddffd74 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -148,7 +148,7 @@ checked="checked"
---|