diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-03-21 12:31:59 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-03-21 12:31:59 +0000 |
| commit | c2096dd195219156d14a4efa95280f9ab104963c (patch) | |
| tree | 82fe8e1693b78cc88657bdecbba0418a6a5f4c01 /wp-admin/admin-functions.php | |
| parent | 2537297297bdf60e586581328b795d1e353a2cce (diff) | |
| download | wordpress-mu-c2096dd195219156d14a4efa95280f9ab104963c.tar.gz wordpress-mu-c2096dd195219156d14a4efa95280f9ab104963c.tar.xz wordpress-mu-c2096dd195219156d14a4efa95280f9ab104963c.zip | |
WP Merge to rev 5072
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@928 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/admin-functions.php')
| -rw-r--r-- | wp-admin/admin-functions.php | 8 |
1 files changed, 4 insertions, 4 deletions
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 .= "</td>\n\t\t<td>"; 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 .= "<a href='$edit_link' class='edit'>".__( 'Edit' )."</a>"; } $r .= "</td>\n\t</tr>"; @@ -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 ); |