<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15494] trunk/wp-admin/network: Fix network files.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15494">15494</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-08-12 00:38:46 +0000 (Thu, 12 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix network files. See <a href="http://trac.wordpress.org/ticket/14579">#14579</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworksitesphp">trunk/wp-admin/network/sites.php</a></li>
<li><a href="#trunkwpadminnetworkusersphp">trunk/wp-admin/network/users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworksitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/sites.php (15493 => 15494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/sites.php 2010-08-12 00:15:31 UTC (rev 15493)
+++ trunk/wp-admin/network/sites.php 2010-08-12 00:38:46 UTC (rev 15494)
</span><span class="lines">@@ -109,12 +109,12 @@
</span><span class="cx"> $editblog_roles = get_blog_option( $id, "{$blog_prefix}user_roles" );
</span><span class="cx"> $is_main_site = is_main_site( $id );
</span><span class="cx">
</span><del>- require_once( './admin-header.php' );
</del><ins>+ require_once( '../admin-header.php' );
</ins><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <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>
</span><del>- <form method="post" action="ms-edit.php?action=updateblog">
</del><ins>+ <form method="post" action="edit.php?action=updateblog">
</ins><span class="cx"> <?php wp_nonce_field( 'editblog' ); ?>
</span><span class="cx"> <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
</span><span class="cx"> <div class="metabox-holder" style="width:49%;float:left;">
</span><span class="lines">@@ -348,11 +348,11 @@
</span><span class="cx"> // List sites
</span><span class="cx"> case 'list':
</span><span class="cx"> default:
</span><del>- require_once( './includes/default-list-tables.php' );
</del><ins>+ require_once( '../includes/default-list-tables.php' );
</ins><span class="cx">
</span><span class="cx"> $table = new WP_Sites_Table;
</span><span class="cx">
</span><del>- require_once( './admin-header.php' );
</del><ins>+ require_once( '../admin-header.php' );
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="lines">@@ -364,7 +364,7 @@
</span><span class="cx"> } ?>
</span><span class="cx"> </h2>
</span><span class="cx">
</span><del>- <form action="ms-sites.php" method="get" id="ms-search">
</del><ins>+ <form action="" method="get" id="ms-search">
</ins><span class="cx"> <p class="search-box">
</span><span class="cx"> <input type="hidden" name="action" value="blogs" />
</span><span class="cx"> <input type="text" name="s" value="<?php echo esc_attr( $s ); ?>" />
</span><span class="lines">@@ -377,14 +377,14 @@
</span><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx">
</span><del>- <form id="form-site-list" action="ms-edit.php?action=allblogs" method="post">
</del><ins>+ <form id="form-site-list" action="edit.php?action=allblogs" method="post">
</ins><span class="cx"> <?php $table->display(); ?>
</span><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="form-add-site" class="wrap">
</span><span class="cx"> <h3><?php _e( 'Add Site' ) ?></h3>
</span><del>- <form method="post" action="ms-edit.php?action=addblog">
</del><ins>+ <form method="post" action="edit.php?action=addblog">
</ins><span class="cx"> <?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr class="form-field form-required">
</span><span class="lines">@@ -419,4 +419,4 @@
</span><span class="cx"> break;
</span><span class="cx"> } // end switch( $action )
</span><span class="cx">
</span><del>-include( './admin-footer.php' ); ?>
</del><ins>+require_once( '../admin-footer.php' ); ?>
</ins></span></pre></div>
<a id="trunkwpadminnetworkusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/users.php (15493 => 15494)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/users.php 2010-08-12 00:15:31 UTC (rev 15493)
+++ trunk/wp-admin/network/users.php 2010-08-12 00:38:46 UTC (rev 15494)
</span><span class="lines">@@ -32,11 +32,11 @@
</span><span class="cx"> '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
</span><span class="cx"> );
</span><span class="cx">
</span><del>-require_once( './includes/default-list-tables.php' );
</del><ins>+require_once( '../includes/default-list-tables.php' );
</ins><span class="cx">
</span><span class="cx"> $table = new WP_MS_Users_Table;
</span><span class="cx">
</span><del>-require_once( './admin-header.php' );
</del><ins>+require_once( '../admin-header.php' );
</ins><span class="cx">
</span><span class="cx"> if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty( $_REQUEST['action'] ) ) {
</span><span class="cx"> ?>
</span><span class="lines">@@ -74,14 +74,14 @@
</span><span class="cx"> ?>
</span><span class="cx"> </h2>
</span><span class="cx">
</span><del>- <form action="ms-users.php" method="get" class="search-form">
</del><ins>+ <form action="" method="get" class="search-form">
</ins><span class="cx"> <p class="search-box">
</span><span class="cx"> <input type="text" name="s" value="<?php echo esc_attr( $s ); ?>" class="search-input" id="user-search-input" />
</span><span class="cx"> <input type="submit" id="post-query-submit" value="<?php esc_attr_e( 'Search Users' ) ?>" class="button" />
</span><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx">
</span><del>- <form id="form-user-list" action='ms-edit.php?action=allusers' method='post'>
</del><ins>+ <form id="form-user-list" action='edit.php?action=allusers' method='post'>
</ins><span class="cx"> <?php $table->display(); ?>
</span><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap" id="form-add-user">
</span><span class="cx"> <h3><?php _e( 'Add User' ) ?></h3>
</span><del>- <form action="ms-edit.php?action=adduser" method="post">
</del><ins>+ <form action="edit.php?action=adduser" method="post">
</ins><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr class="form-field form-required">
</span><span class="cx"> <th scope="row"><?php _e( 'Username' ) ?></th>
</span><span class="lines">@@ -110,6 +110,6 @@
</span><span class="cx"> <input class="button" type="submit" value="<?php esc_attr_e( 'Add user' ) ?>" /></p>
</span><span class="cx"> </form>
</span><span class="cx"> </div>
</span><del>-<?php endif; ?>
</del><ins>+<?php endif;
</ins><span class="cx">
</span><del>-<?php include( './admin-footer.php' ); ?>
</del><ins>+require_once( '../admin-footer.php' ); ?>
</ins></span></pre>
</div>
</div>
</body>
</html>