IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't rely on include_path to include files.

Browse Source 
Always use dirname() or, once available, ABSPATH.

props ketwaroo, hakre.
fixes #17092.

Built from https://develop.svn.wordpress.org/trunk@25616


git-svn-id: http://core.svn.wordpress.org/trunk@25533 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin
2013-09-25 00:18:11 +00:00
parent 0e620877fd
commit fd57b239d2
105 changed files with 225 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/network/about.php
View File

@@ -8,9 +8,9 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
require( '../about.php' );
require( ABSPATH . 'wp-admin/about.php' );

4
wp-admin/network/credits.php
View File

@@ -8,9 +8,9 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
require( '../credits.php' );
require( ABSPATH . 'wp-admin/credits.php' );

2
wp-admin/network/edit.php
View File

@@ -8,7 +8,7 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );

4
wp-admin/network/freedoms.php
View File

@@ -8,9 +8,9 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
require( '../freedoms.php' );
require( ABSPATH . 'wp-admin/freedoms.php' );

6
wp-admin/network/index.php
View File

@@ -8,7 +8,7 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
/** Load WordPress dashboard API */
require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
@@ -62,7 +62,7 @@ add_thickbox();
add_screen_option('layout_columns', array('max' => 4, 'default' => 2) );
require_once( '../admin-header.php' );
require_once( ABSPATH . 'wp-admin/admin-header.php' );
?>
@@ -79,4 +79,4 @@ require_once( '../admin-header.php' );
</div><!-- wrap -->
<?php include( '../admin-footer.php' ); ?>
<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>

4
wp-admin/network/plugin-editor.php
View File

@@ -8,9 +8,9 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
require( '../plugin-editor.php' );
require( ABSPATH . 'wp-admin/plugin-editor.php' );

4
wp-admin/network/plugin-install.php
View File

@@ -11,9 +11,9 @@ if ( isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
define( 'IFRAME_REQUEST', true );
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
require( '../plugin-install.php' );
require( ABSPATH . 'wp-admin/plugin-install.php' );

4
wp-admin/network/plugins.php
View File

@@ -8,9 +8,9 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
require( '../plugins.php' );
require( ABSPATH . 'wp-admin/plugins.php' );

4
wp-admin/network/profile.php
View File

@@ -8,9 +8,9 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
require( '../profile.php' );
require( ABSPATH . 'wp-admin/profile.php' );

6
wp-admin/network/settings.php
View File

@@ -8,7 +8,7 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
@@ -71,7 +71,7 @@ if ( $_POST ) {
exit();
}
include( '../admin-header.php' );
include( ABSPATH . 'wp-admin/admin-header.php' );
if ( isset( $_GET['updated'] ) ) {
?><div id="message" class="updated"><p><?php _e( 'Options saved.' ) ?></p></div><?php
@@ -300,4 +300,4 @@ if ( isset( $_GET['updated'] ) ) {
</form>
</div>
<?php include( '../admin-footer.php' ); ?>
<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>

4
wp-admin/network/setup.php
View File

@@ -8,9 +8,9 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
require( '../network.php' );
require( ABSPATH . 'wp-admin/network.php' );

6
wp-admin/network/site-info.php
View File

@@ -8,7 +8,7 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
@@ -91,7 +91,7 @@ $title = sprintf( __('Edit Site: %s'), $site_url_no_http );
$parent_file = 'sites.php';
$submenu_file = 'sites.php';
require('../admin-header.php');
require( ABSPATH . 'wp-admin/admin-header.php' );
?>
@@ -177,4 +177,4 @@ if ( ! empty( $messages ) ) {
</div>
<?php
require('../admin-footer.php');
require( ABSPATH . 'wp-admin/admin-footer.php' );

6
wp-admin/network/site-new.php
View File

@@ -8,7 +8,7 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
@@ -107,7 +107,7 @@ if ( isset($_GET['update']) ) {
$title = __('Add New Site');
$parent_file = 'sites.php';
require('../admin-header.php');
require( ABSPATH . 'wp-admin/admin-header.php' );
?>
@@ -150,4 +150,4 @@ if ( ! empty( $messages ) ) {
</form>
</div>
<?php
require('../admin-footer.php');
require( ABSPATH . 'wp-admin/admin-footer.php' );

6
wp-admin/network/site-settings.php
View File

@@ -8,7 +8,7 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
@@ -77,7 +77,7 @@ $title = sprintf( __('Edit Site: %s'), $site_url_no_http );
$parent_file = 'sites.php';
$submenu_file = 'sites.php';
require('../admin-header.php');
require( ABSPATH . 'wp-admin/admin-header.php' );
?>
@@ -152,4 +152,4 @@ if ( ! empty( $messages ) ) {
</div>
<?php
require('../admin-footer.php');
require( ABSPATH . 'wp-admin/admin-footer.php' );

4
wp-admin/network/site-themes.php
View File

@@ -8,7 +8,7 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
@@ -132,7 +132,7 @@ $title = sprintf( __('Edit Site: %s'), $site_url_no_http );
$parent_file = 'sites.php';
$submenu_file = 'sites.php';
require('../admin-header.php'); ?>
require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
<div class="wrap">
<?php screen_icon('ms-admin'); ?>

6
wp-admin/network/site-users.php
View File

@@ -8,7 +8,7 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
@@ -167,7 +167,7 @@ $submenu_file = 'sites.php';
if ( ! wp_is_large_network( 'users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) )
wp_enqueue_script( 'user-suggest' );
require('../admin-header.php'); ?>
require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
<script type='text/javascript'>
/* <![CDATA[ */
@@ -307,4 +307,4 @@ endif; ?>
<?php endif; ?>
</div>
<?php
require('../admin-footer.php');
require( ABSPATH . 'wp-admin/admin-footer.php' );

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

@@ -8,7 +8,7 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
@@ -225,7 +225,7 @@ if ( isset( $_GET['updated'] ) ) {
$wp_list_table->prepare_items();
require_once( '../admin-header.php' );
require_once( ABSPATH . 'wp-admin/admin-header.php' );
?>
<div class="wrap">
@@ -254,4 +254,4 @@ require_once( '../admin-header.php' );
</div>
<?php
require_once( '../admin-footer.php' ); ?>
require_once( ABSPATH . 'wp-admin/admin-footer.php' ); ?>

4
wp-admin/network/theme-editor.php
View File

@@ -8,9 +8,9 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
require( '../theme-editor.php' );
require( ABSPATH . 'wp-admin/theme-editor.php' );

4
wp-admin/network/theme-install.php
View File

@@ -11,9 +11,9 @@ if ( isset( $_GET['tab'] ) && ( 'theme-information' == $_GET['tab'] ) )
define( 'IFRAME_REQUEST', true );
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
require( '../theme-install.php' );
require( ABSPATH . 'wp-admin/theme-install.php' );

2
wp-admin/network/themes.php
View File

@@ -8,7 +8,7 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );

4
wp-admin/network/update-core.php
View File

@@ -8,9 +8,9 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
require( '../update-core.php' );
require( ABSPATH . 'wp-admin/update-core.php' );

4
wp-admin/network/update.php
View File

@@ -11,9 +11,9 @@ if ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selec
define( 'IFRAME_REQUEST', true );
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
require( '../update.php' );
require( ABSPATH . 'wp-admin/update.php' );

6
wp-admin/network/upgrade.php
View File

@@ -8,7 +8,7 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
@@ -33,7 +33,7 @@ get_current_screen()->set_help_sidebar(
'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
);
require_once('../admin-header.php');
require_once( ABSPATH . 'wp-admin/admin-header.php' );
if ( ! current_user_can( 'manage_network' ) )
wp_die( __( 'You do not have permission to access this page.' ) );
@@ -99,4 +99,4 @@ switch ( $action ) {
?>
</div>
<?php include('../admin-footer.php'); ?>
<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>

4
wp-admin/network/user-edit.php
View File

@@ -8,9 +8,9 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
require( '../user-edit.php' );
require( ABSPATH . 'wp-admin/user-edit.php' );

6
wp-admin/network/user-new.php
View File

@@ -8,7 +8,7 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
@@ -66,7 +66,7 @@ if ( isset($_GET['update']) ) {
$title = __('Add New User');
$parent_file = 'users.php';
require('../admin-header.php'); ?>
require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
<div class="wrap">
<?php screen_icon(); ?>
@@ -104,4 +104,4 @@ if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?>
</form>
</div>
<?php
require('../admin-footer.php');
require( ABSPATH . 'wp-admin/admin-footer.php' );

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

@@ -8,7 +8,7 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( './admin.php' );
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
@@ -101,11 +101,11 @@ if ( isset( $_GET['action'] ) ) {
$_POST['allusers'] = array( $id ); // confirm_delete_users() can only handle with arrays
$title = __( 'Users' );
$parent_file = 'users.php';
require_once( '../admin-header.php' );
require_once( ABSPATH . 'wp-admin/admin-header.php' );
echo '<div class="wrap">';
confirm_delete_users( $_POST['allusers'] );
echo '</div>';
require_once( '../admin-footer.php' );
require_once( ABSPATH . 'wp-admin/admin-footer.php' );
} else {
wp_redirect( network_admin_url( 'users.php' ) );
}
@@ -130,11 +130,11 @@ if ( isset( $_GET['action'] ) ) {
wp_die( __( 'You do not have permission to access this page.' ) );
$title = __( 'Users' );
$parent_file = 'users.php';
require_once( '../admin-header.php' );
require_once( ABSPATH . 'wp-admin/admin-header.php' );
echo '<div class="wrap">';
confirm_delete_users( $_POST['allusers'] );
echo '</div>';
require_once( '../admin-footer.php' );
require_once( ABSPATH . 'wp-admin/admin-footer.php' );
exit();
break;
@@ -245,7 +245,7 @@ get_current_screen()->set_help_sidebar(
'<p>' . __('<a href="http://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
);
require_once( '../admin-header.php' );
require_once( ABSPATH . 'wp-admin/admin-header.php' );
if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty( $_REQUEST['action'] ) ) {
?>
@@ -296,4 +296,4 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(
</form>
</div>
<?php require_once( '../admin-footer.php' ); ?>
<?php require_once( ABSPATH . 'wp-admin/admin-footer.php' ); ?>