diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-05-21 16:20:00 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-05-21 16:20:00 +0000 |
commit | 4568860c8d3cb4056717ea539d56158b0551a801 (patch) | |
tree | d7def6be8323658c345c44f84e3de0ebf8a760fd /wp-admin/includes | |
parent | 5972f85e186e4d6c16c9516241058ce33538cb76 (diff) | |
download | wordpress-mu-4568860c8d3cb4056717ea539d56158b0551a801.tar.gz wordpress-mu-4568860c8d3cb4056717ea539d56158b0551a801.tar.xz wordpress-mu-4568860c8d3cb4056717ea539d56158b0551a801.zip |
Clean urls, props rboren
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1301 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/includes')
-rw-r--r-- | wp-admin/includes/dashboard.php | 6 | ||||
-rw-r--r-- | wp-admin/includes/media.php | 4 | ||||
-rw-r--r-- | wp-admin/includes/widgets.php | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index 9ce9db9..ea88ee4 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -214,11 +214,11 @@ function wp_dashboard_dynamic_sidebar_params( $params ) { $wp_registered_widgets[$widget_id]['callback'] = 'wp_dashboard_empty'; $sidebar_widget_name = $wp_registered_widget_controls[$widget_id]['name']; $params[1] = 'wp_dashboard_trigger_widget_control'; - $sidebar_before_widget .= '<form action="' . remove_query_arg( 'edit' ) . '" method="post">'; + $sidebar_before_widget .= '<form action="' . clean_url(remove_query_arg( 'edit' )) . '" method="post">'; $sidebar_after_widget = "<div class='dashboard-widget-submit'><input type='hidden' name='sidebar' value='wp_dashboard' /><input type='hidden' name='widget_id' value='$widget_id' /><input type='submit' value='" . __( 'Save' ) . "' /></div></form>$sidebar_after_widget"; - $links[] = '<a href="' . remove_query_arg( 'edit' ) . '">' . __( 'Cancel' ) . '</a>'; + $links[] = '<a href="' . clean_url(remove_query_arg( 'edit' )) . '">' . __( 'Cancel' ) . '</a>'; } else { - $links[] = '<a href="' . add_query_arg( 'edit', $widget_id ) . "#$widget_id" . '">' . __( 'Edit' ) . '</a>'; + $links[] = '<a href="' . clean_url(add_query_arg( 'edit', $widget_id )) . "#$widget_id" . '">' . __( 'Edit' ) . '</a>'; } } diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 9a7140d..be70d92 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -975,7 +975,7 @@ if ( empty($_GET['post_mime_type']) && !empty($num_posts[$type]) ) { } if ( empty($_GET['post_mime_type']) || $_GET['post_mime_type'] == 'all' ) $class = ' class="current"'; -$type_links[] = "<li><a href='" . add_query_arg(array('post_mime_type'=>'all', 'paged'=>false, 'm'=>false)) . "'$class>".__('All Types')."</a>"; +$type_links[] = "<li><a href='" . clean_url(add_query_arg(array('post_mime_type'=>'all', 'paged'=>false, 'm'=>false))) . "'$class>".__('All Types')."</a>"; foreach ( $post_mime_types as $mime_type => $label ) { $class = ''; @@ -985,7 +985,7 @@ foreach ( $post_mime_types as $mime_type => $label ) { if ( wp_match_mime_types($mime_type, $_GET['post_mime_type']) ) $class = ' class="current"'; - $type_links[] = "<li><a href='" . add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false)) . "'$class>" . sprintf(__ngettext($label[2][0], $label[2][1], $num_posts[$mime_type]), "<span id='$mime_type-counter'>" . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>'; + $type_links[] = "<li><a href='" . clean_url(add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false))) . "'$class>" . sprintf(__ngettext($label[2][0], $label[2][1], $num_posts[$mime_type]), "<span id='$mime_type-counter'>" . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>'; } echo implode(' | </li>', $type_links) . '</li>'; unset($type_links); diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php index da8b822..641f80f 100644 --- a/wp-admin/includes/widgets.php +++ b/wp-admin/includes/widgets.php @@ -76,7 +76,7 @@ function wp_list_widgets( $show = 'all', $_search = false ) { } $add_query['add'] = $widget['id']; $action = 'add'; - $add_url = wp_nonce_url( add_query_arg( $add_query ), "add-widget_$widget[id]" ); + $add_url = clean_url( wp_nonce_url( add_query_arg( $add_query ), "add-widget_$widget[id]" ) ); } else { $action = 'edit'; $edit_url = clean_url( add_query_arg( array( @@ -231,7 +231,7 @@ function wp_widget_control( $sidebar_args ) { <?php if ( $edit ) : ?> - <a class="widget-action widget-control-edit" href="<?php echo remove_query_arg( array( 'edit', 'key' ) ); ?>"><?php _e('Cancel'); ?></a> + <a class="widget-action widget-control-edit" href="<?php echo clean_url( remove_query_arg( array( 'edit', 'key' ) ) ); ?>"><?php _e('Cancel'); ?></a> <?php else : ?> |