From c2096dd195219156d14a4efa95280f9ab104963c Mon Sep 17 00:00:00 2001 From: donncha Date: Wed, 21 Mar 2007 12:31:59 +0000 Subject: WP Merge to rev 5072 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@928 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-admin/admin-functions.php | 8 ++++---- wp-admin/wp-admin.css | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'wp-admin') diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 1ed1cf3..732d146 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -611,10 +611,10 @@ function edit_link( $link_id = '' ) { wp_die( __( 'Cheatin’ uh?' )); $_POST['link_url'] = wp_specialchars( $_POST['link_url'] ); - $_POST['link_url'] = preg_match('/^(https?|ftps?|mailto|news|irc|gopher|nntp|feed|telnet):/is', $_POST['link_url']) ? $_POST['link_url'] : 'http://' . $_POST['link_url']; + $_POST['link_url'] = clean_url($_POST['link_url']); $_POST['link_name'] = wp_specialchars( $_POST['link_name'] ); $_POST['link_image'] = wp_specialchars( $_POST['link_image'] ); - $_POST['link_rss'] = wp_specialchars( $_POST['link_rss'] ); + $_POST['link_rss'] = clean_url($_POST['link_rss']); $_POST['link_category'] = $_POST['post_category']; if ( !empty( $link_id ) ) { @@ -891,7 +891,7 @@ function user_row( $user_object, $style = '' ) { } $r .= "\n\t\t"; if ( ( is_site_admin() || $current_user->ID == $user_object->ID ) && current_user_can( 'edit_user', $user_object->ID ) ) { - $edit_link = clean_url( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), "user-edit.php?user_id=$user_object->ID" )); + $edit_link = add_query_arg( 'wp_http_referer', urlencode( clean_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" ); $r .= "".__( 'Edit' ).""; } $r .= "\n\t"; @@ -2222,7 +2222,7 @@ function wp_create_thumbnail( $file, $max_side, $effect = '' ) { // If no filters change the filename, we'll do a default transformation. if ( basename( $file ) == $thumb = apply_filters( 'thumbnail_filename', basename( $file ) ) ) - $thumb = preg_replace( '!(\.[^.]+)?$!', __( '.thumbnail' ).'$1', basename( $file ), 1 ); + $thumb = preg_replace( '!(\.[^.]+)?$!', '.thumbnail' . '$1', basename( $file ), 1 ); $thumbpath = str_replace( basename( $file ), $thumb, $file ); diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 5a784a3..d3d7b1f 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -731,10 +731,7 @@ input.delete:hover { width: 320px; display: block; border-bottom: none; -} - -#login .hide { - display: none; + text-indent: -9999px; } #login .message { -- cgit