diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-08-25 15:09:59 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-08-25 15:09:59 +0000 |
| commit | dff411e9faea50447fb31498b92e3d9ed68ebed6 (patch) | |
| tree | 7d15b21fea4c76a1f7c6976cda298b57f7bb4519 /wp-admin | |
| parent | a43b200014ea74072bc74a4076a67f8ccb96ec86 (diff) | |
| download | wordpress-mu-dff411e9faea50447fb31498b92e3d9ed68ebed6.tar.gz wordpress-mu-dff411e9faea50447fb31498b92e3d9ed68ebed6.tar.xz wordpress-mu-dff411e9faea50447fb31498b92e3d9ed68ebed6.zip | |
Improved confirmation message, fixes #722, props momo360modena
git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1439 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin')
| -rw-r--r-- | wp-admin/wpmu-edit.php | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/wp-admin/wpmu-edit.php b/wp-admin/wpmu-edit.php index 1d3c567..426e730 100644 --- a/wp-admin/wpmu-edit.php +++ b/wp-admin/wpmu-edit.php @@ -6,9 +6,9 @@ if( is_site_admin() == false ) { do_action('wpmuadminedit', ''); -if( $_GET[ 'id' ] ) { +if( isset($_GET[ 'id' ]) ) { $id = intval( $_GET[ 'id' ] ); -} elseif( $_POST[ 'id' ] ) { +} elseif( isset($_POST[ 'id' ]) ) { $id = intval( $_POST[ 'id' ] ); } @@ -358,7 +358,8 @@ switch( $_GET['action'] ) { // Common case "confirm": - global $wp_locale; + $referrer = ( isset($_GET['ref']) ) ? stripslashes($_GET['ref']) : $_SERVER['HTTP_REFERER']; + $referrer = clean_url($referrer); if( !headers_sent() ){ nocache_headers(); header( 'Content-Type: text/html; charset=utf-8' ); @@ -370,21 +371,17 @@ switch( $_GET['action'] ) { <title><?php _e("WordPress MU › Confirm your action"); ?></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <link rel="stylesheet" href="css/install.css" type="text/css" /> - <?php if ( ( $wp_locale ) && ('rtl' == $wp_locale->text_direction) ) : ?> - <link rel="stylesheet" href="css/install-rtl.css" type="text/css" /> - <?php endif; ?> + <?php wp_admin_css( 'install', true ); ?> </head> <body id="error-page"> <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1> <form action='wpmu-edit.php?action=<?php echo wp_specialchars( $_GET[ 'action2' ] ) ?>' method='post'> <input type='hidden' name='action' value='<?php echo wp_specialchars( $_GET['action2'] ) ?>' /> <input type='hidden' name='id' value='<?php echo wp_specialchars( $id ); ?>' /> - <input type='hidden' name='ref' value='<?php if( isset( $_GET['ref'] ) ) {echo wp_specialchars( $_GET['ref'] ); } else { echo $_SERVER['HTTP_REFERER']; } ?>' /> + <input type='hidden' name='ref' value='<?php echo $referrer; ?>' /> <?php wp_nonce_field( $_GET['action2'] ) ?> - <p> - <?php echo wp_specialchars( $_GET['msg'] ) ?><br /> - <input class="button" type='submit' value='<?php _e("Confirm"); ?>' /></p> + <p><?php echo wp_specialchars( stripslashes($_GET['msg']) ); ?></p> + <p class="submit"><input class="button" type='submit' value='<?php _e("Confirm"); ?>' /></p> </form> </body> </html> |