Some URL cleaning
git-svn-id: http://svn.automattic.com/wordpress/trunk@7962 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
bc07ef1efe
commit
74f878d040
|
@ -216,11 +216,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>';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -966,7 +966,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 = '';
|
||||
|
||||
|
@ -976,7 +976,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);
|
||||
|
|
|
@ -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(
|
||||
|
@ -232,7 +232,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 : ?>
|
||||
|
||||
|
|
Loading…
Reference in New Issue