From fd57b239d281ad5f4e6c55da862d691c15eae38d Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Wed, 25 Sep 2013 00:18:11 +0000 Subject: [PATCH] Don't rely on include_path to include files. 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 --- index.php | 2 +- wp-activate.php | 4 ++-- wp-admin/about.php | 2 +- wp-admin/admin-header.php | 2 +- wp-admin/admin-post.php | 2 +- wp-admin/async-upload.php | 4 ++-- wp-admin/comment.php | 12 ++++++------ wp-admin/credits.php | 2 +- wp-admin/customize.php | 2 +- wp-admin/edit-comments.php | 6 +++--- wp-admin/edit-form-advanced.php | 4 ++-- wp-admin/edit-link-form.php | 4 ++-- wp-admin/edit-tags.php | 10 +++++----- wp-admin/edit.php | 6 +++--- wp-admin/export.php | 8 ++++---- wp-admin/freedoms.php | 2 +- wp-admin/import.php | 6 +++--- wp-admin/index.php | 2 +- wp-admin/install.php | 4 ++-- wp-admin/link-add.php | 6 +++--- wp-admin/link-manager.php | 6 +++--- wp-admin/link.php | 6 +++--- wp-admin/maint/repair.php | 2 +- wp-admin/media-new.php | 2 +- wp-admin/media-upload.php | 2 +- wp-admin/media.php | 6 +++--- wp-admin/moderation.php | 2 +- wp-admin/ms-admin.php | 2 +- wp-admin/ms-delete-site.php | 6 +++--- wp-admin/ms-edit.php | 2 +- wp-admin/ms-options.php | 4 ++-- wp-admin/ms-sites.php | 2 +- wp-admin/ms-themes.php | 2 +- wp-admin/ms-upgrade-network.php | 2 +- wp-admin/ms-users.php | 2 +- wp-admin/my-sites.php | 6 +++--- wp-admin/nav-menus.php | 6 +++--- wp-admin/network.php | 2 +- wp-admin/network/about.php | 4 ++-- wp-admin/network/credits.php | 4 ++-- wp-admin/network/edit.php | 2 +- wp-admin/network/freedoms.php | 4 ++-- wp-admin/network/index.php | 6 +++--- wp-admin/network/plugin-editor.php | 4 ++-- wp-admin/network/plugin-install.php | 4 ++-- wp-admin/network/plugins.php | 4 ++-- wp-admin/network/profile.php | 4 ++-- wp-admin/network/settings.php | 6 +++--- wp-admin/network/setup.php | 4 ++-- wp-admin/network/site-info.php | 6 +++--- wp-admin/network/site-new.php | 6 +++--- wp-admin/network/site-settings.php | 6 +++--- wp-admin/network/site-themes.php | 4 ++-- wp-admin/network/site-users.php | 6 +++--- wp-admin/network/sites.php | 6 +++--- wp-admin/network/theme-editor.php | 4 ++-- wp-admin/network/theme-install.php | 4 ++-- wp-admin/network/themes.php | 2 +- wp-admin/network/update-core.php | 4 ++-- wp-admin/network/update.php | 4 ++-- wp-admin/network/upgrade.php | 6 +++--- wp-admin/network/user-edit.php | 4 ++-- wp-admin/network/user-new.php | 6 +++--- wp-admin/network/users.php | 14 +++++++------- wp-admin/options-discussion.php | 6 +++--- wp-admin/options-general.php | 6 +++--- wp-admin/options-media.php | 6 +++--- wp-admin/options-permalink.php | 4 ++-- wp-admin/options-reading.php | 6 +++--- wp-admin/options-writing.php | 6 +++--- wp-admin/options.php | 6 +++--- wp-admin/plugin-editor.php | 2 +- wp-admin/plugin-install.php | 2 +- wp-admin/plugins.php | 2 +- wp-admin/post-new.php | 6 +++--- wp-admin/post.php | 6 +++--- wp-admin/press-this.php | 2 +- wp-admin/profile.php | 2 +- wp-admin/revision.php | 6 +++--- wp-admin/theme-editor.php | 2 +- wp-admin/theme-install.php | 2 +- wp-admin/themes.php | 8 ++++---- wp-admin/tools.php | 6 +++--- wp-admin/update-core.php | 4 ++-- wp-admin/update.php | 2 +- wp-admin/upgrade.php | 2 +- wp-admin/upload.php | 6 +++--- wp-admin/user-edit.php | 2 +- wp-admin/user-new.php | 6 +++--- wp-admin/user/about.php | 4 ++-- wp-admin/user/credits.php | 4 ++-- wp-admin/user/freedoms.php | 4 ++-- wp-admin/user/index.php | 4 ++-- wp-admin/user/profile.php | 4 ++-- wp-admin/user/user-edit.php | 4 ++-- wp-admin/users.php | 10 +++++----- wp-admin/widgets.php | 10 +++++----- wp-cron.php | 2 +- wp-includes/class-feed.php | 2 +- wp-includes/feed.php | 2 +- wp-includes/js/tinymce/wp-mce-help.php | 2 +- wp-includes/rss-functions.php | 2 +- wp-links-opml.php | 4 ++-- wp-signup.php | 2 +- wp-trackback.php | 2 +- 105 files changed, 225 insertions(+), 225 deletions(-) diff --git a/index.php b/index.php index 1e3364ad1b..dd3d554472 100644 --- a/index.php +++ b/index.php @@ -14,4 +14,4 @@ define('WP_USE_THEMES', true); /** Loads the WordPress Environment and Template */ -require('./wp-blog-header.php'); +require( dirname( __FILE__ ) . '/wp-blog-header.php' ); diff --git a/wp-activate.php b/wp-activate.php index ae5c1b2eaf..eea60d5096 100644 --- a/wp-activate.php +++ b/wp-activate.php @@ -11,7 +11,7 @@ define( 'WP_INSTALLING', true ); /** Sets up the WordPress Environment. */ require( dirname(__FILE__) . '/wp-load.php' ); -require( './wp-blog-header.php' ); +require( dirname( __FILE__ ) . '/wp-blog-header.php' ); if ( !is_multisite() ) { wp_redirect( site_url( '/wp-login.php?action=register' ) ); @@ -126,4 +126,4 @@ get_header(); var key_input = document.getElementById('key'); key_input && key_input.focus(); - \ No newline at end of file + diff --git a/wp-admin/about.php b/wp-admin/about.php index 8b155d21b4..0c83f39e25 100644 --- a/wp-admin/about.php +++ b/wp-admin/about.php @@ -7,7 +7,7 @@ */ /** WordPress Administration Bootstrap */ -require_once( './admin.php' ); +require_once( dirname( __FILE__ ) . '/admin.php' ); $title = __( 'About' ); diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index 5ee86ae398..a677dde375 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -8,7 +8,7 @@ @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); if ( ! defined( 'WP_ADMIN' ) ) - require_once( './admin.php' ); + require_once( dirname( __FILE__ ) . '/admin.php' ); // In case admin-header.php is included in a function. global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow, $wp_version, diff --git a/wp-admin/admin-post.php b/wp-admin/admin-post.php index 28df1b4c0d..d5644cd98e 100644 --- a/wp-admin/admin-post.php +++ b/wp-admin/admin-post.php @@ -14,7 +14,7 @@ define('WP_ADMIN', true); if ( defined('ABSPATH') ) require_once(ABSPATH . 'wp-load.php'); else - require_once('../wp-load.php'); + require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' ); /** Allow for cross-domain requests (from the frontend). */ send_origin_headers(); diff --git a/wp-admin/async-upload.php b/wp-admin/async-upload.php index 296342eaa1..3a24b52572 100644 --- a/wp-admin/async-upload.php +++ b/wp-admin/async-upload.php @@ -11,7 +11,7 @@ define('WP_ADMIN', true); if ( defined('ABSPATH') ) require_once(ABSPATH . 'wp-load.php'); else - require_once('../wp-load.php'); + require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' ); if ( ! ( isset( $_REQUEST['action'] ) && 'upload-attachment' == $_REQUEST['action'] ) ) { // Flash often fails to send cookies with the POST or upload, so we need to pass it in GET or POST instead @@ -24,7 +24,7 @@ if ( ! ( isset( $_REQUEST['action'] ) && 'upload-attachment' == $_REQUEST['actio unset($current_user); } -require_once('./admin.php'); +require_once( ABSPATH . 'wp-admin/admin.php' ); if ( !current_user_can('upload_files') ) wp_die(__('You do not have permission to upload files.')); diff --git a/wp-admin/comment.php b/wp-admin/comment.php index d20f98510a..5c9edf6782 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -7,7 +7,7 @@ */ /** Load WordPress Bootstrap */ -require_once('./admin.php'); +require_once( dirname( __FILE__ ) . '/admin.php' ); $parent_file = 'edit-comments.php'; $submenu_file = 'edit-comments.php'; @@ -36,7 +36,7 @@ if ( isset( $_GET['dt'] ) ) { */ function comment_footer_die( $msg ) { echo "

$msg

"; - include('./admin-footer.php'); + include( ABSPATH . 'wp-admin/admin-footer.php' ); die; } @@ -60,7 +60,7 @@ case 'editcomment' : ); wp_enqueue_script('comment'); - require_once('./admin-header.php'); + require_once( ABSPATH . 'wp-admin/admin-header.php' ); $comment_id = absint( $_GET['c'] ); @@ -75,7 +75,7 @@ case 'editcomment' : $comment = get_comment_to_edit( $comment_id ); - include('./edit-form-comment.php'); + include( ABSPATH . 'wp-admin/edit-form-comment.php' ); break; @@ -104,7 +104,7 @@ case 'spam' : die(); } - require_once('./admin-header.php'); + require_once( ABSPATH . 'wp-admin/admin-header.php' ); $formaction = $action . 'comment'; $nonce_action = 'approve' == $action ? 'approve-comment_' : 'delete-comment_'; @@ -300,4 +300,4 @@ default: } // end switch -include('./admin-footer.php'); +include( ABSPATH . 'wp-admin/admin-footer.php' ); diff --git a/wp-admin/credits.php b/wp-admin/credits.php index 65da470494..547a7afc9b 100644 --- a/wp-admin/credits.php +++ b/wp-admin/credits.php @@ -7,7 +7,7 @@ */ /** WordPress Administration Bootstrap */ -require_once( './admin.php' ); +require_once( dirname( __FILE__ ) . '/admin.php' ); $title = __( 'Credits' ); diff --git a/wp-admin/customize.php b/wp-admin/customize.php index a9e05c2fd5..6f337084e0 100644 --- a/wp-admin/customize.php +++ b/wp-admin/customize.php @@ -9,7 +9,7 @@ define( 'IFRAME_REQUEST', true ); -require_once( './admin.php' ); +require_once( dirname( __FILE__ ) . '/admin.php' ); if ( ! current_user_can( 'edit_theme_options' ) ) wp_die( __( 'Cheatin’ uh?' ) ); diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index f001f6f410..f084ab5fc5 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -7,7 +7,7 @@ */ /** WordPress Administration Bootstrap */ -require_once('./admin.php'); +require_once( dirname( __FILE__ ) . '/admin.php' ); if ( !current_user_can('edit_posts') ) wp_die(__('Cheatin’ uh?')); @@ -136,7 +136,7 @@ get_current_screen()->set_help_sidebar( '

' . __( 'Support Forums' ) . '

' ); -require_once('./admin-header.php'); +require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
@@ -252,4 +252,4 @@ if ( isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQU +include( ABSPATH . 'wp-admin/admin-footer.php' ); ?> diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index e466606a00..11ab30a087 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -107,7 +107,7 @@ if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql $post_type_object = get_post_type_object($post_type); // All meta boxes should be defined and added before the first do_meta_boxes() call (or potentially during the do_meta_boxes action). -require_once('./includes/meta-boxes.php'); +require_once( ABSPATH . 'wp-admin/includes/meta-boxes.php' ); $publish_callback_args = null; @@ -309,7 +309,7 @@ if ( 'post' == $post_type ) { ) ); } -require_once('./admin-header.php'); +require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php index 0aca6e7bc1..97b5aef51e 100644 --- a/wp-admin/edit-link-form.php +++ b/wp-admin/edit-link-form.php @@ -22,7 +22,7 @@ if ( ! empty($link_id) ) { $nonce_action = 'add-bookmark'; } -require_once('./includes/meta-boxes.php'); +require_once( ABSPATH . 'wp-admin/includes/meta-boxes.php' ); add_meta_box('linksubmitdiv', __('Save'), 'link_submit_meta_box', null, 'side', 'core'); add_meta_box('linkcategorydiv', __('Categories'), 'link_categories_meta_box', null, 'normal', 'core'); @@ -54,7 +54,7 @@ get_current_screen()->set_help_sidebar( '

' . __( 'Support Forums' ) . '

' ); -require_once ('admin-header.php'); +require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 86bb606109..0a046370b3 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -7,7 +7,7 @@ */ /** WordPress Administration Bootstrap */ -require_once('./admin.php'); +require_once( dirname( __FILE__ ) . '/admin.php' ); if ( ! $taxnow ) wp_die( __( 'Invalid taxonomy' ) ); @@ -126,8 +126,8 @@ case 'edit': $tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' ); if ( ! $tag ) wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) ); - require_once ( 'admin-header.php' ); - include( './edit-tag-form.php' ); + require_once( ABSPATH . 'wp-admin/admin-header.php' ); + include( ABSPATH . 'wp-admin/edit-tag-form.php' ); break; @@ -247,7 +247,7 @@ if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $t unset( $help ); } -require_once ('admin-header.php'); +require_once( ABSPATH . 'wp-admin/admin-header.php' ); if ( !current_user_can($tax->cap->edit_terms) ) wp_die( __('You are not allowed to edit this item.') ); @@ -462,4 +462,4 @@ try{document.forms.addtag['tag-name'].focus();}catch(e){} break; } -include('./admin-footer.php'); +include( ABSPATH . 'wp-admin/admin-footer.php' ); diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 4fd97ee587..8d32036117 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -7,7 +7,7 @@ */ /** WordPress Administration Bootstrap */ -require_once( './admin.php' ); +require_once( dirname( __FILE__ ) . '/admin.php' ); if ( ! $typenow ) wp_die( __( 'Invalid post type' ) ); @@ -262,7 +262,7 @@ $bulk_messages['page'] = array( $bulk_messages = apply_filters( 'bulk_post_updated_messages', $bulk_messages, $bulk_counts ); $bulk_counts = array_filter( $bulk_counts ); -require_once('./admin-header.php'); +require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
@@ -322,4 +322,4 @@ if ( $wp_list_table->has_items() )
- + diff --git a/wp-admin/freedoms.php b/wp-admin/freedoms.php index d7accd1b5a..22d7a0f782 100644 --- a/wp-admin/freedoms.php +++ b/wp-admin/freedoms.php @@ -7,7 +7,7 @@ */ /** WordPress Administration Bootstrap */ -require_once( './admin.php' ); +require_once( dirname( __FILE__ ) . '/admin.php' ); $title = __( 'Freedoms' ); diff --git a/wp-admin/import.php b/wp-admin/import.php index 72b9142f45..076f0d1f3d 100644 --- a/wp-admin/import.php +++ b/wp-admin/import.php @@ -9,7 +9,7 @@ define('WP_LOAD_IMPORTERS', true); /** Load WordPress Bootstrap */ -require_once ('admin.php'); +require_once( dirname( __FILE__ ) . '/admin.php' ); if ( !current_user_can('import') ) wp_die(__('You do not have sufficient permissions to import content in this site.')); @@ -47,7 +47,7 @@ if ( ! empty( $_GET['invalid'] ) && isset( $popular_importers[ $_GET['invalid'] add_thickbox(); wp_enqueue_script( 'plugin-install' ); -require_once ('admin-header.php'); +require_once( ABSPATH . 'wp-admin/admin-header.php' ); $parent_file = 'tools.php'; ?> @@ -130,4 +130,4 @@ if ( current_user_can('install_plugins') ) set_help_sidebar( '

' . __('Support Forums') . '

' ); -include_once ('./admin-header.php'); +include_once( ABSPATH . 'wp-admin/admin-header.php' ); if ( ! current_user_can('manage_links') ) wp_die(__("You do not have sufficient permissions to edit the links for this site.")); @@ -97,4 +97,4 @@ if ( isset($_REQUEST['deleted']) ) {
diff --git a/wp-admin/media-new.php b/wp-admin/media-new.php index e428811957..d8f8b63347 100644 --- a/wp-admin/media-new.php +++ b/wp-admin/media-new.php @@ -10,7 +10,7 @@ */ /** Load WordPress Administration Bootstrap */ -require_once('./admin.php'); +require_once( dirname( __FILE__ ) . '/admin.php' ); if (!current_user_can('upload_files')) wp_die(__('You do not have permission to upload files.')); diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php index 96af66bb8d..19c4f33052 100644 --- a/wp-admin/media-upload.php +++ b/wp-admin/media-upload.php @@ -13,7 +13,7 @@ if ( ! isset( $_GET['inline'] ) ) define( 'IFRAME_REQUEST' , true ); /** Load WordPress Administration Bootstrap */ -require_once('./admin.php'); +require_once( dirname( __FILE__ ) . '/admin.php' ); if (!current_user_can('upload_files')) wp_die(__('You do not have permission to upload files.')); diff --git a/wp-admin/media.php b/wp-admin/media.php index 15d4323876..c9f0348359 100644 --- a/wp-admin/media.php +++ b/wp-admin/media.php @@ -7,7 +7,7 @@ */ /** Load WordPress Administration Bootstrap */ -require_once('./admin.php'); +require_once( dirname( __FILE__ ) . '/admin.php' ); $parent_file = 'upload.php'; $submenu_file = 'upload.php'; @@ -84,7 +84,7 @@ case 'edit' : '

' . __('Support Forums') . '

' ); - require( './admin-header.php' ); + require( ABSPATH . 'wp-admin/admin-header.php' ); $parent_file = 'upload.php'; $message = ''; @@ -136,7 +136,7 @@ if ( current_user_can( 'upload_files' ) ) { ?> '; screen_icon(); @@ -89,4 +89,4 @@ Webmaster } echo '
'; -include( './admin-footer.php' ); +include( ABSPATH . 'wp-admin/admin-footer.php' ); diff --git a/wp-admin/ms-edit.php b/wp-admin/ms-edit.php index 6e56e026a9..5c405e6f73 100644 --- a/wp-admin/ms-edit.php +++ b/wp-admin/ms-edit.php @@ -7,7 +7,7 @@ * @since 3.0.0 */ -require_once( './admin.php' ); +require_once( dirname( __FILE__ ) . '/admin.php' ); wp_redirect( network_admin_url() ); exit; diff --git a/wp-admin/ms-options.php b/wp-admin/ms-options.php index 784ac24f17..764e937757 100644 --- a/wp-admin/ms-options.php +++ b/wp-admin/ms-options.php @@ -7,6 +7,6 @@ * @since 3.0.0 */ -require_once( './admin.php' ); +require_once( dirname( __FILE__ ) . '/admin.php' ); -wp_redirect( network_admin_url('settings.php') ); \ No newline at end of file +wp_redirect( network_admin_url('settings.php') ); diff --git a/wp-admin/ms-sites.php b/wp-admin/ms-sites.php index 00502c915a..4f2f2a9b51 100644 --- a/wp-admin/ms-sites.php +++ b/wp-admin/ms-sites.php @@ -7,7 +7,7 @@ * @since 3.0.0 */ -require_once( './admin.php' ); +require_once( dirname( __FILE__ ) . '/admin.php' ); wp_redirect( network_admin_url('sites.php') ); exit; diff --git a/wp-admin/ms-themes.php b/wp-admin/ms-themes.php index ad873babb4..1a03c66652 100644 --- a/wp-admin/ms-themes.php +++ b/wp-admin/ms-themes.php @@ -7,7 +7,7 @@ * @since 3.0.0 */ -require_once( './admin.php' ); +require_once( dirname( __FILE__ ) . '/admin.php' ); wp_redirect( network_admin_url('themes.php') ); exit; diff --git a/wp-admin/ms-upgrade-network.php b/wp-admin/ms-upgrade-network.php index 3d36a2cc59..ebf5d27a95 100644 --- a/wp-admin/ms-upgrade-network.php +++ b/wp-admin/ms-upgrade-network.php @@ -7,7 +7,7 @@ * @since 3.0.0 */ -require_once('admin.php'); +require_once( dirname( __FILE__ ) . '/admin.php' ); wp_redirect( network_admin_url('upgrade.php') ); exit; diff --git a/wp-admin/ms-users.php b/wp-admin/ms-users.php index a3be929ac7..cc89815058 100644 --- a/wp-admin/ms-users.php +++ b/wp-admin/ms-users.php @@ -7,7 +7,7 @@ * @since 3.0.0 */ -require_once( './admin.php' ); +require_once( dirname( __FILE__ ) . '/admin.php' ); wp_redirect( network_admin_url('users.php') ); exit; diff --git a/wp-admin/my-sites.php b/wp-admin/my-sites.php index 2ef4ca77e8..61073587c4 100644 --- a/wp-admin/my-sites.php +++ b/wp-admin/my-sites.php @@ -7,7 +7,7 @@ * @since 3.0.0 */ -require_once( './admin.php' ); +require_once( dirname( __FILE__ ) . '/admin.php' ); if ( !is_multisite() ) wp_die( __( 'Multisite support is not enabled.' ) ); @@ -49,7 +49,7 @@ get_current_screen()->set_help_sidebar( '

' . __('Support Forums') . '

' ); -require_once( './admin-header.php' ); +require_once( ABSPATH . 'wp-admin/admin-header.php' ); if ( $updated ) { ?>

@@ -117,4 +117,4 @@ else : set_help_sidebar( ); // Get the admin header -require_once( './admin-header.php' ); +require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
@@ -762,4 +762,4 @@ require_once( './admin-header.php' );
- + diff --git a/wp-admin/network.php b/wp-admin/network.php index c3dea68471..cdef7f4067 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -13,7 +13,7 @@ define( 'WP_INSTALLING_NETWORK', true ); /** WordPress Administration Bootstrap */ -require_once( './admin.php' ); +require_once( dirname( __FILE__ ) . '/admin.php' ); if ( ! is_super_admin() ) wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) ); diff --git a/wp-admin/network/about.php b/wp-admin/network/about.php index e8bbe999d0..4ad541268a 100644 --- a/wp-admin/network/about.php +++ b/wp-admin/network/about.php @@ -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' ); \ No newline at end of file +require( ABSPATH . 'wp-admin/about.php' ); diff --git a/wp-admin/network/credits.php b/wp-admin/network/credits.php index 82caa3ad08..3d3ae1496b 100644 --- a/wp-admin/network/credits.php +++ b/wp-admin/network/credits.php @@ -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' ); \ No newline at end of file +require( ABSPATH . 'wp-admin/credits.php' ); diff --git a/wp-admin/network/edit.php b/wp-admin/network/edit.php index e76f25878c..b1ae4bbb05 100644 --- a/wp-admin/network/edit.php +++ b/wp-admin/network/edit.php @@ -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.' ) ); diff --git a/wp-admin/network/freedoms.php b/wp-admin/network/freedoms.php index a15a4c3fd3..da7f86bd22 100644 --- a/wp-admin/network/freedoms.php +++ b/wp-admin/network/freedoms.php @@ -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' ); \ No newline at end of file +require( ABSPATH . 'wp-admin/freedoms.php' ); diff --git a/wp-admin/network/index.php b/wp-admin/network/index.php index 38f5357e34..5514331cf3 100644 --- a/wp-admin/network/index.php +++ b/wp-admin/network/index.php @@ -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' ); - + diff --git a/wp-admin/network/plugin-editor.php b/wp-admin/network/plugin-editor.php index 8850aa8f88..9af590c45a 100644 --- a/wp-admin/network/plugin-editor.php +++ b/wp-admin/network/plugin-editor.php @@ -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' ); diff --git a/wp-admin/network/plugin-install.php b/wp-admin/network/plugin-install.php index 5c6243f1cf..a8a1c17297 100644 --- a/wp-admin/network/plugin-install.php +++ b/wp-admin/network/plugin-install.php @@ -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' ); \ No newline at end of file +require( ABSPATH . 'wp-admin/plugin-install.php' ); diff --git a/wp-admin/network/plugins.php b/wp-admin/network/plugins.php index 514a22b41a..e997060526 100644 --- a/wp-admin/network/plugins.php +++ b/wp-admin/network/plugins.php @@ -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' ); \ No newline at end of file +require( ABSPATH . 'wp-admin/plugins.php' ); diff --git a/wp-admin/network/profile.php b/wp-admin/network/profile.php index c100e68865..df6b782711 100644 --- a/wp-admin/network/profile.php +++ b/wp-admin/network/profile.php @@ -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' ); \ No newline at end of file +require( ABSPATH . 'wp-admin/profile.php' ); diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php index da4ac4d05c..de39b26be2 100644 --- a/wp-admin/network/settings.php +++ b/wp-admin/network/settings.php @@ -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'] ) ) { ?>

- + diff --git a/wp-admin/network/setup.php b/wp-admin/network/setup.php index e5d5880f9e..35938990e6 100644 --- a/wp-admin/network/setup.php +++ b/wp-admin/network/setup.php @@ -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' ); \ No newline at end of file +require( ABSPATH . 'wp-admin/network.php' ); diff --git a/wp-admin/network/site-info.php b/wp-admin/network/site-info.php index 38bed75800..6a952b646f 100644 --- a/wp-admin/network/site-info.php +++ b/wp-admin/network/site-info.php @@ -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 ) ) { @@ -150,4 +150,4 @@ if ( ! empty( $messages ) ) { @@ -152,4 +152,4 @@ if ( ! empty( $messages ) ) { +require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php index 0c7a1c7296..62c6212c3f 100644 --- a/wp-admin/network/site-users.php +++ b/wp-admin/network/site-users.php @@ -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' ); ?>