Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Fix network files. See #14579

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15494 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
scribu 2010-08-12 00:38:46 +00:00
parent 11ffaae225
commit b6f7a90c29
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-admin/network/sites.php
View File

@ -109,12 +109,12 @@ switch ( $action ) {
$editblog_roles = get_blog_option( $id, "{$blog_prefix}user_roles" ); $editblog_roles = get_blog_option( $id, "{$blog_prefix}user_roles" );
$is_main_site = is_main_site( $id ); $is_main_site = is_main_site( $id );
require_once( './admin-header.php' ); require_once( '../admin-header.php' );
?> ?>
<div class="wrap"> <div class="wrap">
<?php screen_icon(); ?> <?php screen_icon(); ?>
<h2><?php _e( 'Edit Site' ); ?> - <a href="<?php echo esc_url( get_home_url( $id ) ); ?>"><?php echo esc_url( get_home_url( $id ) ); ?></a></h2> <h2><?php _e( 'Edit Site' ); ?> - <a href="<?php echo esc_url( get_home_url( $id ) ); ?>"><?php echo esc_url( get_home_url( $id ) ); ?></a></h2>
<form method="post" action="ms-edit.php?action=updateblog"> <form method="post" action="edit.php?action=updateblog">
<?php wp_nonce_field( 'editblog' ); ?> <?php wp_nonce_field( 'editblog' ); ?>
<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" /> <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
<div class="metabox-holder" style="width:49%;float:left;"> <div class="metabox-holder" style="width:49%;float:left;">
@ -348,11 +348,11 @@ switch ( $action ) {
// List sites // List sites
case 'list': case 'list':
default: default:
require_once( './includes/default-list-tables.php' ); require_once( '../includes/default-list-tables.php' );
$table = new WP_Sites_Table; $table = new WP_Sites_Table;
require_once( './admin-header.php' ); require_once( '../admin-header.php' );
?> ?>
<div class="wrap"> <div class="wrap">
@ -364,7 +364,7 @@ switch ( $action ) {
} ?> } ?>
</h2> </h2>
<form action="ms-sites.php" method="get" id="ms-search"> <form action="" method="get" id="ms-search">
<p class="search-box"> <p class="search-box">
<input type="hidden" name="action" value="blogs" /> <input type="hidden" name="action" value="blogs" />
<input type="text" name="s" value="<?php echo esc_attr( $s ); ?>" /> <input type="text" name="s" value="<?php echo esc_attr( $s ); ?>" />
@ -377,14 +377,14 @@ switch ( $action ) {
</p> </p>
</form> </form>
<form id="form-site-list" action="ms-edit.php?action=allblogs" method="post"> <form id="form-site-list" action="edit.php?action=allblogs" method="post">
<?php $table->display(); ?> <?php $table->display(); ?>
</form> </form>
</div> </div>
<div id="form-add-site" class="wrap"> <div id="form-add-site" class="wrap">
<h3><?php _e( 'Add Site' ) ?></h3> <h3><?php _e( 'Add Site' ) ?></h3>
<form method="post" action="ms-edit.php?action=addblog"> <form method="post" action="edit.php?action=addblog">
<?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?> <?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
<table class="form-table"> <table class="form-table">
<tr class="form-field form-required"> <tr class="form-field form-required">
@ -419,4 +419,4 @@ switch ( $action ) {
break; break;
} // end switch( $action ) } // end switch( $action )
include( './admin-footer.php' ); ?> require_once( '../admin-footer.php' ); ?>

14
wp-admin/network/users.php
View File

@ -32,11 +32,11 @@ add_contextual_help($current_screen,
'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>' '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
); );
require_once( './includes/default-list-tables.php' ); require_once( '../includes/default-list-tables.php' );
$table = new WP_MS_Users_Table; $table = new WP_MS_Users_Table;
require_once( './admin-header.php' ); require_once( '../admin-header.php' );
if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty( $_REQUEST['action'] ) ) { if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty( $_REQUEST['action'] ) ) {
?> ?>
@ -74,14 +74,14 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(
?> ?>
</h2> </h2>
<form action="ms-users.php" method="get" class="search-form"> <form action="" method="get" class="search-form">
<p class="search-box"> <p class="search-box">
<input type="text" name="s" value="<?php echo esc_attr( $s ); ?>" class="search-input" id="user-search-input" /> <input type="text" name="s" value="<?php echo esc_attr( $s ); ?>" class="search-input" id="user-search-input" />
<input type="submit" id="post-query-submit" value="<?php esc_attr_e( 'Search Users' ) ?>" class="button" /> <input type="submit" id="post-query-submit" value="<?php esc_attr_e( 'Search Users' ) ?>" class="button" />
</p> </p>
</form> </form>
<form id="form-user-list" action='ms-edit.php?action=allusers' method='post'> <form id="form-user-list" action='edit.php?action=allusers' method='post'>
<?php $table->display(); ?> <?php $table->display(); ?>
</form> </form>
</div> </div>
@ -91,7 +91,7 @@ if ( apply_filters( 'show_adduser_fields', true ) ) :
?> ?>
<div class="wrap" id="form-add-user"> <div class="wrap" id="form-add-user">
<h3><?php _e( 'Add User' ) ?></h3> <h3><?php _e( 'Add User' ) ?></h3>
<form action="ms-edit.php?action=adduser" method="post"> <form action="edit.php?action=adduser" method="post">
<table class="form-table"> <table class="form-table">
<tr class="form-field form-required"> <tr class="form-field form-required">
<th scope="row"><?php _e( 'Username' ) ?></th> <th scope="row"><?php _e( 'Username' ) ?></th>
@ -110,6 +110,6 @@ if ( apply_filters( 'show_adduser_fields', true ) ) :
<input class="button" type="submit" value="<?php esc_attr_e( 'Add user' ) ?>" /></p> <input class="button" type="submit" value="<?php esc_attr_e( 'Add user' ) ?>" /></p>
</form> </form>
</div> </div>
<?php endif; ?> <?php endif;
<?php include( './admin-footer.php' ); ?> require_once( '../admin-footer.php' ); ?>