Permalink
Browse files

Use relative paths when including files, avoiding include_path. fixes…

… #12594, props sorich87.

git-svn-id: http://svn.automattic.com/wordpress/trunk@14139 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent 0d0902e commit 6ec7cb454099b12bb6f7d6089db823765fb58794 nacin committed Apr 18, 2010
Showing with 139 additions and 139 deletions.
  1. +1 −1 wp-activate.php
  2. +1 −1 wp-admin/admin-ajax.php
  3. +1 −1 wp-admin/admin-header.php
  4. +1 −1 wp-admin/async-upload.php
  5. +6 −6 wp-admin/comment.php
  6. +3 −3 wp-admin/edit-comments.php
  7. +2 −2 wp-admin/edit-form-advanced.php
  8. +2 −2 wp-admin/edit-link-categories.php
  9. +1 −1 wp-admin/edit-link-form.php
  10. +3 −3 wp-admin/edit-tags.php
  11. +4 −4 wp-admin/edit.php
  12. +1 −1 wp-admin/export.php
  13. +2 −2 wp-admin/index-extra.php
  14. +2 −2 wp-admin/index.php
  15. +3 −3 wp-admin/link-add.php
  16. +3 −3 wp-admin/link-category.php
  17. +1 −1 wp-admin/link-manager.php
  18. +2 −2 wp-admin/media-new.php
  19. +3 −3 wp-admin/media-upload.php
  20. +3 −3 wp-admin/media.php
  21. +1 −1 wp-admin/ms-upgrade-network.php
  22. +3 −3 wp-admin/nav-menus.php
  23. +2 −2 wp-admin/options-discussion.php
  24. +2 −2 wp-admin/options-media.php
  25. +2 −2 wp-admin/options-permalink.php
  26. +2 −2 wp-admin/options-reading.php
  27. +2 −2 wp-admin/options-writing.php
  28. +3 −3 wp-admin/options.php
  29. +3 −3 wp-admin/plugin-editor.php
  30. +3 −3 wp-admin/plugin-install.php
  31. +7 −7 wp-admin/plugins.php
  32. +3 −3 wp-admin/post.php
  33. +1 −1 wp-admin/press-this.php
  34. +1 −1 wp-admin/profile.php
  35. +4 −4 wp-admin/revision.php
  36. +1 −1 wp-admin/sidebar.php
  37. +3 −3 wp-admin/theme-editor.php
  38. +3 −3 wp-admin/theme-install.php
  39. +3 −3 wp-admin/themes.php
  40. +3 −3 wp-admin/tools.php
  41. +6 −6 wp-admin/update-core.php
  42. +13 −13 wp-admin/update.php
  43. +4 −4 wp-admin/upload.php
  44. +2 −2 wp-admin/user-edit.php
  45. +2 −2 wp-admin/user-new.php
  46. +3 −3 wp-admin/users.php
  47. +7 −7 wp-admin/widgets.php
  48. +2 −2 wp-includes/compat.php
  49. +2 −2 wp-includes/media.php
  50. +1 −1 wp-signup.php
View
@@ -4,7 +4,7 @@
/** Sets up the WordPress Environment. */
require( dirname(__FILE__) . '/wp-load.php' );
-require( 'wp-blog-header.php' );
+require( './wp-blog-header.php' );
if ( !is_multisite() ) {
wp_redirect( get_option( 'siteurl' ) . "/wp-login.php?action=register" );
View
@@ -19,7 +19,7 @@
if ( ! isset( $_REQUEST['action'] ) )
die('-1');
-require_once('includes/admin.php');
+require_once('./includes/admin.php');
@header('Content-Type: text/html; charset=' . get_option('blog_charset'));
send_nosniff_header();
@@ -7,7 +7,7 @@
*/
@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
-if (!isset($_GET["page"])) require_once('admin.php');
+if (!isset($_GET["page"])) require_once('./admin.php');
get_admin_page_title();
$title = esc_html( strip_tags( $title ) );
@@ -21,7 +21,7 @@
if ( empty($_COOKIE[LOGGED_IN_COOKIE]) && !empty($_REQUEST['logged_in_cookie']) )
$_COOKIE[LOGGED_IN_COOKIE] = $_REQUEST['logged_in_cookie'];
unset($current_user);
-require_once('admin.php');
+require_once('./admin.php');
header('Content-Type: text/plain; charset=' . get_option('blog_charset'));
View
@@ -7,7 +7,7 @@
*/
/** Load WordPress Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');
$parent_file = 'edit-comments.php';
$submenu_file = 'edit-comments.php';
@@ -36,7 +36,7 @@
*/
function comment_footer_die( $msg ) {
echo "<div class='wrap'><p>$msg</p></div>";
- include('admin-footer.php');
+ include('./admin-footer.php');
die;
}
@@ -46,7 +46,7 @@ function comment_footer_die( $msg ) {
$title = __('Edit Comment');
wp_enqueue_script('comment');
- require_once('admin-header.php');
+ require_once('./admin-header.php');
$comment_id = absint( $_GET['c'] );
@@ -61,7 +61,7 @@ function comment_footer_die( $msg ) {
$comment = get_comment_to_edit( $comment_id );
- include('edit-form-comment.php');
+ include('./edit-form-comment.php');
break;
@@ -88,7 +88,7 @@ function comment_footer_die( $msg ) {
die();
}
- require_once('admin-header.php');
+ require_once('./admin-header.php');
$formaction = $action . 'comment';
$nonce_action = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
@@ -276,6 +276,6 @@ function comment_footer_die( $msg ) {
} // end switch
-include('admin-footer.php');
+include('./admin-footer.php');
?>
@@ -7,7 +7,7 @@
*/
/** WordPress Administration Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');
if ( !current_user_can('edit_posts') )
wp_die(__('Cheatin&#8217; uh?'));
@@ -105,7 +105,7 @@
else
$title = __('Edit Comments');
-require_once('admin-header.php');
+require_once('./admin-header.php');
$mode = ( empty($_GET['mode']) ) ? 'detail' : esc_attr($_GET['mode']);
@@ -468,4 +468,4 @@
<?php
wp_comment_reply('-1', true, 'detail');
wp_comment_trashnotice();
-include('admin-footer.php'); ?>
+include('./admin-footer.php'); ?>
@@ -102,7 +102,7 @@
$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('./includes/meta-boxes.php');
add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', $post_type, 'side', 'core');
@@ -165,7 +165,7 @@
add_contextual_help($current_screen, drag_drop_help());
-require_once('admin-header.php');
+require_once('./admin-header.php');
?>
<div class="wrap">
@@ -7,7 +7,7 @@
*/
/** WordPress Administration Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');
// Handle bulk actions
if ( isset($_GET['action']) && isset($_GET['delete']) ) {
@@ -227,4 +227,4 @@
</div><!-- /wrap -->
<?php inline_edit_term_row('edit-link-categories', 'link_category'); ?>
-<?php include('admin-footer.php'); ?>
+<?php include('./admin-footer.php'); ?>
@@ -22,7 +22,7 @@
$nonce_action = 'add-bookmark';
}
-require_once('includes/meta-boxes.php');
+require_once('./includes/meta-boxes.php');
add_meta_box('linksubmitdiv', __('Save'), 'link_submit_meta_box', 'link', 'side', 'core');
add_meta_box('linkcategorydiv', __('Categories'), 'link_categories_meta_box', 'link', 'normal', 'core');
View
@@ -7,7 +7,7 @@
*/
/** WordPress Administration Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');
wp_reset_vars( array('action', 'tag', 'taxonomy', 'post_type') );
@@ -122,7 +122,7 @@
$tag_ID = (int) $_GET['tag_ID'];
$tag = get_term($tag_ID, $taxonomy, OBJECT, 'edit');
- include('edit-tag-form.php');
+ include('./edit-tag-form.php');
break;
@@ -402,6 +402,6 @@
break;
}
-include('admin-footer.php');
+include('./admin-footer.php');
?>
View
@@ -7,7 +7,7 @@
*/
/** WordPress Administration Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');
if ( !isset($_GET['post_type']) )
$post_type = 'post';
@@ -156,7 +156,7 @@
else
$num_pages = $wp_query->max_num_pages;
-require_once('admin-header.php');
+require_once('./admin-header.php');
if ( empty($_GET['mode']) )
$mode = 'list';
@@ -375,7 +375,7 @@
<div class="clear"></div>
-<?php include( 'edit-post-rows.php' ); ?>
+<?php include( './edit-post-rows.php' ); ?>
<div class="tablenav">
@@ -425,4 +425,4 @@
</div>
<?php
-include('admin-footer.php');
+include('./admin-footer.php');
View
@@ -13,7 +13,7 @@
wp_die(__('You do not have sufficient permissions to export the content of this blog.'));
/** Load WordPress export API */
-require_once('includes/export.php');
+require_once('./includes/export.php');
$title = __('Export');
if ( isset( $_GET['download'] ) ) {
View
@@ -7,10 +7,10 @@
*/
/** Load WordPress Bootstrap */
-require_once( 'admin.php' );
+require_once( './admin.php' );
/** Load WordPress Administration Dashboard API */
-require( 'includes/dashboard.php' );
+require( './includes/dashboard.php' );
@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
send_nosniff_header();
View
@@ -7,7 +7,7 @@
*/
/** Load WordPress Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');
/** Load WordPress dashboard API */
require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
@@ -26,7 +26,7 @@
add_contextual_help($current_screen, '<p>' . __('The modules on this screen can be arranged in several columns. You can select the number of columns from the Screen Options tab.') . "</p>\n" . drag_drop_help() );
-require_once('admin-header.php');
+require_once('./admin-header.php');
$today = current_time('mysql', 1);
?>
View
@@ -7,7 +7,7 @@
*/
/** Load WordPress Administration Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');
if ( ! current_user_can('manage_links') )
wp_die(__('You do not have sufficient permissions to add links to this blog.'));
@@ -24,7 +24,7 @@
wp_enqueue_script('xfn');
$link = get_default_link_to_edit();
-include('edit-link-form.php');
+include('./edit-link-form.php');
-require('admin-footer.php');
+require('./admin-footer.php');
?>
@@ -10,7 +10,7 @@
*/
/** Load WordPress Administration Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');
wp_reset_vars(array('action', 'cat'));
@@ -67,8 +67,8 @@
require_once ('admin-header.php');
$cat_ID = (int) $_GET['cat_ID'];
$category = get_term_to_edit($cat_ID, 'link_category');
- include('edit-link-category-form.php');
- include('admin-footer.php');
+ include('./edit-link-category-form.php');
+ include('./admin-footer.php');
exit;
break;
@@ -278,4 +278,4 @@
</div>
<?php
-include('admin-footer.php');
+include('./admin-footer.php');
View
@@ -8,7 +8,7 @@
$_GET['inline'] = 'true';
/** Administration bootstrap */
-require_once('admin.php');
-require_once('media-upload.php');
+require_once('./admin.php');
+require_once('./media-upload.php');
?>
@@ -10,7 +10,7 @@
*/
/** Load WordPress Administration Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');
if (!current_user_can('upload_files'))
wp_die(__('You do not have permission to upload files.'));
@@ -56,7 +56,7 @@
$title = __('Upload New Media');
$parent_file = 'upload.php';
- require_once('admin-header.php'); ?>
+ require_once('./admin-header.php'); ?>
<div class="wrap">
<?php screen_icon(); ?>
<h2><?php echo esc_html( $title ); ?></h2>
@@ -86,7 +86,7 @@
</div>
<?php
- include('admin-footer.php');
+ include('./admin-footer.php');
} else {
View
@@ -7,7 +7,7 @@
*/
/** Load WordPress Administration Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');
$parent_file = 'upload.php';
$submenu_file = 'upload.php';
@@ -67,7 +67,7 @@
wp_enqueue_script('image-edit');
wp_enqueue_style('imgareaselect');
- require( 'admin-header.php' );
+ require( './admin-header.php' );
$parent_file = 'upload.php';
$message = '';
@@ -114,7 +114,7 @@
<?php
- require( 'admin-footer.php' );
+ require( './admin-footer.php' );
exit;
@@ -74,4 +74,4 @@ function nextpage() {
?>
</div>
-<?php include('admin-footer.php'); ?>
+<?php include('./admin-footer.php'); ?>
View
@@ -10,7 +10,7 @@
*/
/** Load WordPress Administration Bootstrap */
-require_once( 'admin.php' );
+require_once( './admin.php' );
// Load all the nav menu interface functions
require_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
@@ -235,7 +235,7 @@
}
// Get the admin header
-require_once( 'admin-header.php' );
+require_once( './admin-header.php' );
?>
<div class="wrap">
<?php screen_icon(); ?>
@@ -345,4 +345,4 @@
<input type="hidden" id="edit-menu-item-id" name="edit-item-id" value="" />
</div><!-- /#menu-item-settings-->
-<?php include( 'admin-footer.php' ); ?>
+<?php include( './admin-footer.php' ); ?>
Oops, something went wrong.

0 comments on commit 6ec7cb4

Please sign in to comment.