Skip to content

Commit ec4f5b8

Browse files
committed
Use relative paths when including files, avoiding include_path. fixes #12594, props sorich87.
git-svn-id: https://develop.svn.wordpress.org/trunk@14139 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 148e92a commit ec4f5b8

50 files changed

Lines changed: 139 additions & 139 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

wp-activate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/** Sets up the WordPress Environment. */
55
require( dirname(__FILE__) . '/wp-load.php' );
66

7-
require( 'wp-blog-header.php' );
7+
require( './wp-blog-header.php' );
88

99
if ( !is_multisite() ) {
1010
wp_redirect( get_option( 'siteurl' ) . "/wp-login.php?action=register" );

wp-admin/admin-ajax.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
if ( ! isset( $_REQUEST['action'] ) )
2020
die('-1');
2121

22-
require_once('includes/admin.php');
22+
require_once('./includes/admin.php');
2323
@header('Content-Type: text/html; charset=' . get_option('blog_charset'));
2424
send_nosniff_header();
2525

wp-admin/admin-header.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
10-
if (!isset($_GET["page"])) require_once('admin.php');
10+
if (!isset($_GET["page"])) require_once('./admin.php');
1111

1212
get_admin_page_title();
1313
$title = esc_html( strip_tags( $title ) );

wp-admin/async-upload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
if ( empty($_COOKIE[LOGGED_IN_COOKIE]) && !empty($_REQUEST['logged_in_cookie']) )
2222
$_COOKIE[LOGGED_IN_COOKIE] = $_REQUEST['logged_in_cookie'];
2323
unset($current_user);
24-
require_once('admin.php');
24+
require_once('./admin.php');
2525

2626
header('Content-Type: text/plain; charset=' . get_option('blog_charset'));
2727

wp-admin/comment.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
/** Load WordPress Bootstrap */
10-
require_once('admin.php');
10+
require_once('./admin.php');
1111

1212
$parent_file = 'edit-comments.php';
1313
$submenu_file = 'edit-comments.php';
@@ -36,7 +36,7 @@
3636
*/
3737
function comment_footer_die( $msg ) {
3838
echo "<div class='wrap'><p>$msg</p></div>";
39-
include('admin-footer.php');
39+
include('./admin-footer.php');
4040
die;
4141
}
4242

@@ -46,7 +46,7 @@ function comment_footer_die( $msg ) {
4646
$title = __('Edit Comment');
4747

4848
wp_enqueue_script('comment');
49-
require_once('admin-header.php');
49+
require_once('./admin-header.php');
5050

5151
$comment_id = absint( $_GET['c'] );
5252

@@ -61,7 +61,7 @@ function comment_footer_die( $msg ) {
6161

6262
$comment = get_comment_to_edit( $comment_id );
6363

64-
include('edit-form-comment.php');
64+
include('./edit-form-comment.php');
6565

6666
break;
6767

@@ -88,7 +88,7 @@ function comment_footer_die( $msg ) {
8888
die();
8989
}
9090

91-
require_once('admin-header.php');
91+
require_once('./admin-header.php');
9292

9393
$formaction = $action . 'comment';
9494
$nonce_action = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
@@ -276,6 +276,6 @@ function comment_footer_die( $msg ) {
276276

277277
} // end switch
278278

279-
include('admin-footer.php');
279+
include('./admin-footer.php');
280280

281281
?>

wp-admin/edit-comments.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
/** WordPress Administration Bootstrap */
10-
require_once('admin.php');
10+
require_once('./admin.php');
1111

1212
if ( !current_user_can('edit_posts') )
1313
wp_die(__('Cheatin&#8217; uh?'));
@@ -105,7 +105,7 @@
105105
else
106106
$title = __('Edit Comments');
107107

108-
require_once('admin-header.php');
108+
require_once('./admin-header.php');
109109

110110
$mode = ( empty($_GET['mode']) ) ? 'detail' : esc_attr($_GET['mode']);
111111

@@ -468,4 +468,4 @@
468468
<?php
469469
wp_comment_reply('-1', true, 'detail');
470470
wp_comment_trashnotice();
471-
include('admin-footer.php'); ?>
471+
include('./admin-footer.php'); ?>

wp-admin/edit-form-advanced.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
$post_type_object = get_post_type_object($post_type);
103103

104104
// All meta boxes should be defined and added before the first do_meta_boxes() call (or potentially during the do_meta_boxes action).
105-
require_once('includes/meta-boxes.php');
105+
require_once('./includes/meta-boxes.php');
106106

107107
add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', $post_type, 'side', 'core');
108108

@@ -165,7 +165,7 @@
165165

166166
add_contextual_help($current_screen, drag_drop_help());
167167

168-
require_once('admin-header.php');
168+
require_once('./admin-header.php');
169169
?>
170170

171171
<div class="wrap">

wp-admin/edit-link-categories.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
/** WordPress Administration Bootstrap */
10-
require_once('admin.php');
10+
require_once('./admin.php');
1111

1212
// Handle bulk actions
1313
if ( isset($_GET['action']) && isset($_GET['delete']) ) {
@@ -227,4 +227,4 @@
227227
</div><!-- /wrap -->
228228

229229
<?php inline_edit_term_row('edit-link-categories', 'link_category'); ?>
230-
<?php include('admin-footer.php'); ?>
230+
<?php include('./admin-footer.php'); ?>

wp-admin/edit-link-form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
$nonce_action = 'add-bookmark';
2323
}
2424

25-
require_once('includes/meta-boxes.php');
25+
require_once('./includes/meta-boxes.php');
2626

2727
add_meta_box('linksubmitdiv', __('Save'), 'link_submit_meta_box', 'link', 'side', 'core');
2828
add_meta_box('linkcategorydiv', __('Categories'), 'link_categories_meta_box', 'link', 'normal', 'core');

wp-admin/edit-tags.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
/** WordPress Administration Bootstrap */
10-
require_once('admin.php');
10+
require_once('./admin.php');
1111

1212
wp_reset_vars( array('action', 'tag', 'taxonomy', 'post_type') );
1313

@@ -122,7 +122,7 @@
122122
$tag_ID = (int) $_GET['tag_ID'];
123123

124124
$tag = get_term($tag_ID, $taxonomy, OBJECT, 'edit');
125-
include('edit-tag-form.php');
125+
include('./edit-tag-form.php');
126126

127127
break;
128128

@@ -402,6 +402,6 @@
402402
break;
403403
}
404404

405-
include('admin-footer.php');
405+
include('./admin-footer.php');
406406

407407
?>

0 commit comments

Comments
 (0)