Index: src/wp-admin/about.php =================================================================== --- src/wp-admin/about.php (revision 41634) +++ src/wp-admin/about.php (working copy) @@ -32,7 +32,7 @@ list( $display_version ) = explode( '-', get_bloginfo( 'version' ) ); -include( ABSPATH . 'wp-admin/admin-header.php' ); +include( ABSPATH . WPADMIN . '/admin-header.php' ); ?>

@@ -228,7 +228,7 @@
- +
@@ -44,7 +44,7 @@ ); echo '

'; echo '
'; - include( ABSPATH . 'wp-admin/admin-footer.php' ); + include( ABSPATH . WPADMIN . '/admin-footer.php' ); exit; } @@ -109,7 +109,7 @@
__( 'Comments list' ), ) ); -require_once( ABSPATH . 'wp-admin/admin-header.php' ); +require_once( ABSPATH . WPADMIN . '/admin-header.php' ); ?>
@@ -331,4 +331,4 @@ +include( ABSPATH . WPADMIN . '/admin-footer.php' ); ?> Index: src/wp-admin/edit-form-advanced.php =================================================================== --- src/wp-admin/edit-form-advanced.php (revision 41634) +++ src/wp-admin/edit-form-advanced.php (working copy) @@ -212,7 +212,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( ABSPATH . 'wp-admin/includes/meta-boxes.php' ); +require_once( ABSPATH . WPADMIN . '/includes/meta-boxes.php' ); $publish_callback_args = null; @@ -469,7 +469,7 @@ ) ); } -require_once( ABSPATH . 'wp-admin/admin-header.php' ); +require_once( ABSPATH . WPADMIN . '/admin-header.php' ); ?>
Index: src/wp-admin/edit-link-form.php =================================================================== --- src/wp-admin/edit-link-form.php (revision 41634) +++ src/wp-admin/edit-link-form.php (working copy) @@ -22,7 +22,7 @@ $nonce_action = 'add-bookmark'; } -require_once( ABSPATH . 'wp-admin/includes/meta-boxes.php' ); +require_once( ABSPATH . WPADMIN . '/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'); @@ -66,7 +66,7 @@ '

' . __( 'Support Forums' ) . '

' ); -require_once( ABSPATH . 'wp-admin/admin-header.php' ); +require_once( ABSPATH . WPADMIN . '/admin-header.php' ); ?>
Index: src/wp-admin/edit-tag-form.php =================================================================== --- src/wp-admin/edit-tag-form.php (revision 41634) +++ src/wp-admin/edit-tag-form.php (working copy) @@ -52,7 +52,7 @@ $wp_http_referer = remove_query_arg( array( 'action', 'message', 'tag_ID' ), $wp_http_referer ); /** Also used by Edit Tags */ -require_once( ABSPATH . 'wp-admin/includes/edit-tag-messages.php' ); +require_once( ABSPATH . WPADMIN . '/includes/edit-tag-messages.php' ); /** * Fires before the Edit Term form for all taxonomies. Index: src/wp-admin/edit-tags.php =================================================================== --- src/wp-admin/edit-tags.php (revision 41634) +++ src/wp-admin/edit-tags.php (working copy) @@ -276,10 +276,10 @@ unset( $help ); } -require_once( ABSPATH . 'wp-admin/admin-header.php' ); +require_once( ABSPATH . WPADMIN . '/admin-header.php' ); /** Also used by the Edit Tag form */ -require_once( ABSPATH . 'wp-admin/includes/edit-tag-messages.php' ); +require_once( ABSPATH . WPADMIN . '/includes/edit-tag-messages.php' ); $class = ( isset( $_REQUEST['error'] ) ) ? 'error' : 'updated'; @@ -588,4 +588,4 @@ $wp_list_table->inline_edit(); -include( ABSPATH . 'wp-admin/admin-footer.php' ); +include( ABSPATH . WPADMIN . '/admin-footer.php' ); Index: src/wp-admin/edit.php =================================================================== --- src/wp-admin/edit.php (revision 41634) +++ src/wp-admin/edit.php (working copy) @@ -300,7 +300,7 @@ $bulk_messages = apply_filters( 'bulk_post_updated_messages', $bulk_messages, $bulk_counts ); $bulk_counts = array_filter( $bulk_counts ); -require_once( ABSPATH . 'wp-admin/admin-header.php' ); +require_once( ABSPATH . WPADMIN . '/admin-header.php' ); ?>

- + Index: src/wp-admin/freedoms.php =================================================================== --- src/wp-admin/freedoms.php (revision 41634) +++ src/wp-admin/freedoms.php (working copy) @@ -13,7 +13,7 @@ list( $display_version ) = explode( '-', get_bloginfo( 'version' ) ); -include( ABSPATH . 'wp-admin/admin-header.php' ); +include( ABSPATH . WPADMIN . '/admin-header.php' ); ?>
@@ -51,4 +51,4 @@

Free Software Foundation.' ); ?>

- + Index: src/wp-admin/import.php =================================================================== --- src/wp-admin/import.php (revision 41634) +++ src/wp-admin/import.php (working copy) @@ -51,7 +51,7 @@ wp_enqueue_script( 'plugin-install' ); wp_enqueue_script( 'updates' ); -require_once( ABSPATH . 'wp-admin/admin-header.php' ); +require_once( ABSPATH . WPADMIN . '/admin-header.php' ); $parent_file = 'tools.php'; ?> @@ -203,4 +203,4 @@ wp_print_request_filesystem_credentials_modal(); wp_print_admin_notice_templates(); -include( ABSPATH . 'wp-admin/admin-footer.php' ); +include( ABSPATH . WPADMIN . '/admin-footer.php' ); Index: src/wp-admin/includes/admin.php =================================================================== --- src/wp-admin/includes/admin.php (revision 41634) +++ src/wp-admin/includes/admin.php (working copy) @@ -17,71 +17,71 @@ } /** WordPress Administration Hooks */ -require_once(ABSPATH . 'wp-admin/includes/admin-filters.php'); +require_once(ABSPATH . WPADMIN . '/includes/admin-filters.php'); /** WordPress Bookmark Administration API */ -require_once(ABSPATH . 'wp-admin/includes/bookmark.php'); +require_once(ABSPATH . WPADMIN . '/includes/bookmark.php'); /** WordPress Comment Administration API */ -require_once(ABSPATH . 'wp-admin/includes/comment.php'); +require_once(ABSPATH . WPADMIN . '/includes/comment.php'); /** WordPress Administration File API */ -require_once(ABSPATH . 'wp-admin/includes/file.php'); +require_once(ABSPATH . WPADMIN . '/includes/file.php'); /** WordPress Image Administration API */ -require_once(ABSPATH . 'wp-admin/includes/image.php'); +require_once(ABSPATH . WPADMIN . '/includes/image.php'); /** WordPress Media Administration API */ -require_once(ABSPATH . 'wp-admin/includes/media.php'); +require_once(ABSPATH . WPADMIN . '/includes/media.php'); /** WordPress Import Administration API */ -require_once(ABSPATH . 'wp-admin/includes/import.php'); +require_once(ABSPATH . WPADMIN . '/includes/import.php'); /** WordPress Misc Administration API */ -require_once(ABSPATH . 'wp-admin/includes/misc.php'); +require_once(ABSPATH . WPADMIN . '/includes/misc.php'); /** WordPress Options Administration API */ -require_once(ABSPATH . 'wp-admin/includes/options.php'); +require_once(ABSPATH . WPADMIN . '/includes/options.php'); /** WordPress Plugin Administration API */ -require_once(ABSPATH . 'wp-admin/includes/plugin.php'); +require_once(ABSPATH . WPADMIN . '/includes/plugin.php'); /** WordPress Post Administration API */ -require_once(ABSPATH . 'wp-admin/includes/post.php'); +require_once(ABSPATH . WPADMIN . '/includes/post.php'); /** WordPress Administration Screen API */ -require_once(ABSPATH . 'wp-admin/includes/class-wp-screen.php'); -require_once(ABSPATH . 'wp-admin/includes/screen.php'); +require_once(ABSPATH . WPADMIN . '/includes/class-wp-screen.php'); +require_once(ABSPATH . WPADMIN . '/includes/screen.php'); /** WordPress Taxonomy Administration API */ -require_once(ABSPATH . 'wp-admin/includes/taxonomy.php'); +require_once(ABSPATH . WPADMIN . '/includes/taxonomy.php'); /** WordPress Template Administration API */ -require_once(ABSPATH . 'wp-admin/includes/template.php'); +require_once(ABSPATH . WPADMIN . '/includes/template.php'); /** WordPress List Table Administration API and base class */ -require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table.php'); -require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table-compat.php'); -require_once(ABSPATH . 'wp-admin/includes/list-table.php'); +require_once(ABSPATH . WPADMIN . '/includes/class-wp-list-table.php'); +require_once(ABSPATH . WPADMIN . '/includes/class-wp-list-table-compat.php'); +require_once(ABSPATH . WPADMIN . '/includes/list-table.php'); /** WordPress Theme Administration API */ -require_once(ABSPATH . 'wp-admin/includes/theme.php'); +require_once(ABSPATH . WPADMIN . '/includes/theme.php'); /** WordPress User Administration API */ -require_once(ABSPATH . 'wp-admin/includes/user.php'); +require_once(ABSPATH . WPADMIN . '/includes/user.php'); /** WordPress Site Icon API */ -require_once(ABSPATH . 'wp-admin/includes/class-wp-site-icon.php'); +require_once(ABSPATH . WPADMIN . '/includes/class-wp-site-icon.php'); /** WordPress Update Administration API */ -require_once(ABSPATH . 'wp-admin/includes/update.php'); +require_once(ABSPATH . WPADMIN . '/includes/update.php'); /** WordPress Deprecated Administration API */ -require_once(ABSPATH . 'wp-admin/includes/deprecated.php'); +require_once(ABSPATH . WPADMIN . '/includes/deprecated.php'); /** WordPress Multisite support API */ if ( is_multisite() ) { - require_once(ABSPATH . 'wp-admin/includes/ms-admin-filters.php'); - require_once(ABSPATH . 'wp-admin/includes/ms.php'); - require_once(ABSPATH . 'wp-admin/includes/ms-deprecated.php'); + require_once(ABSPATH . WPADMIN . '/includes/ms-admin-filters.php'); + require_once(ABSPATH . WPADMIN . '/includes/ms.php'); + require_once(ABSPATH . WPADMIN . '/includes/ms-deprecated.php'); } Index: src/wp-admin/includes/ajax-actions.php =================================================================== --- src/wp-admin/includes/ajax-actions.php (revision 41634) +++ src/wp-admin/includes/ajax-actions.php (working copy) @@ -217,7 +217,7 @@ check_ajax_referer( "image_editor-$post_id" ); - include_once( ABSPATH . 'wp-admin/includes/image-edit.php' ); + include_once( ABSPATH . WPADMIN . '/includes/image-edit.php' ); if ( ! stream_preview_image($post_id) ) wp_die( -1 ); @@ -302,7 +302,7 @@ * @since 4.8.0 */ function wp_ajax_get_community_events() { - require_once( ABSPATH . 'wp-admin/includes/class-wp-community-events.php' ); + require_once( ABSPATH . WPADMIN . '/includes/class-wp-community-events.php' ); check_ajax_referer( 'community_events' ); @@ -352,7 +352,7 @@ * @since 3.4.0 */ function wp_ajax_dashboard_widgets() { - require_once ABSPATH . 'wp-admin/includes/dashboard.php'; + require_once ABSPATH . WPADMIN . '/includes/dashboard.php'; $pagenow = $_GET['pagenow']; if ( $pagenow === 'dashboard-user' || $pagenow === 'dashboard-network' || $pagenow === 'dashboard' ) { @@ -1107,7 +1107,7 @@ ob_start(); if ( isset( $_REQUEST['mode'] ) && 'dashboard' == $_REQUEST['mode'] ) { - require_once( ABSPATH . 'wp-admin/includes/dashboard.php' ); + require_once( ABSPATH . WPADMIN . '/includes/dashboard.php' ); _wp_dashboard_recent_comments_row( $comment ); } else { if ( isset( $_REQUEST['mode'] ) && 'single' == $_REQUEST['mode'] ) { @@ -1203,7 +1203,7 @@ if ( ! current_user_can( 'edit_theme_options' ) ) wp_die( -1 ); - require_once ABSPATH . 'wp-admin/includes/nav-menu.php'; + require_once ABSPATH . WPADMIN . '/includes/nav-menu.php'; // For performance reasons, we omit some object properties from the checklist. // The following is a hacky way to restore them when adding non-custom items. @@ -1488,7 +1488,7 @@ if ( ! current_user_can( 'edit_theme_options' ) ) wp_die( -1 ); - require_once ABSPATH . 'wp-admin/includes/nav-menu.php'; + require_once ABSPATH . WPADMIN . '/includes/nav-menu.php'; if ( isset( $_POST['item-type'] ) && 'post_type' == $_POST['item-type'] ) { $type = 'posttype'; @@ -1616,7 +1616,7 @@ if ( ! current_user_can( 'edit_theme_options' ) ) wp_die( -1 ); - require_once ABSPATH . 'wp-admin/includes/nav-menu.php'; + require_once ABSPATH . WPADMIN . '/includes/nav-menu.php'; _wp_ajax_menu_quick_search( $_POST ); @@ -2149,7 +2149,7 @@ wp_die( -1 ); check_ajax_referer( "image_editor-$attachment_id" ); - include_once( ABSPATH . 'wp-admin/includes/image-edit.php' ); + include_once( ABSPATH . WPADMIN . '/includes/image-edit.php' ); $msg = false; switch ( $_POST['do'] ) { @@ -2847,7 +2847,7 @@ * @since 3.6.0 */ function wp_ajax_get_revision_diffs() { - require ABSPATH . 'wp-admin/includes/revision.php'; + require ABSPATH . WPADMIN . '/includes/revision.php'; if ( ! $post = get_post( (int) $_REQUEST['post_id'] ) ) wp_send_json_error(); @@ -3211,7 +3211,7 @@ switch ( $context ) { case 'site-icon': - require_once ABSPATH . '/wp-admin/includes/class-wp-site-icon.php'; + require_once ABSPATH . '/' . WPADMIN . '/includes/class-wp-site-icon.php'; $wp_site_icon = new WP_Site_Icon(); // Skip creating a new attachment if the attachment is a Site Icon. @@ -3362,8 +3362,8 @@ wp_send_json_error( $status ); } - include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); - include_once( ABSPATH . 'wp-admin/includes/theme.php' ); + include_once( ABSPATH . WPADMIN . '/includes/class-wp-upgrader.php' ); + include_once( ABSPATH . WPADMIN . '/includes/theme.php' ); $api = themes_api( 'theme_information', array( 'slug' => $slug, @@ -3477,7 +3477,7 @@ $status['oldVersion'] = $theme->get( 'Version' ); } - include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); + include_once( ABSPATH . WPADMIN . '/includes/class-wp-upgrader.php' ); $current = get_site_transient( 'update_themes' ); if ( empty( $current ) ) { @@ -3587,7 +3587,7 @@ wp_send_json_error( $status ); } - include_once( ABSPATH . 'wp-admin/includes/theme.php' ); + include_once( ABSPATH . WPADMIN . '/includes/theme.php' ); $result = delete_theme( $stylesheet ); @@ -3632,8 +3632,8 @@ wp_send_json_error( $status ); } - include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); - include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); + include_once( ABSPATH . WPADMIN . '/includes/class-wp-upgrader.php' ); + include_once( ABSPATH . WPADMIN . '/includes/plugin-install.php' ); $api = plugins_api( 'plugin_information', array( 'slug' => sanitize_key( wp_unslash( $_POST['slug'] ) ), @@ -3746,7 +3746,7 @@ $status['oldVersion'] = sprintf( __( 'Version %s' ), $plugin_data['Version'] ); } - include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); + include_once( ABSPATH . WPADMIN . '/includes/class-wp-upgrader.php' ); wp_update_plugins(); Index: src/wp-admin/includes/class-core-upgrader.php =================================================================== --- src/wp-admin/includes/class-core-upgrader.php (revision 41634) +++ src/wp-admin/includes/class-core-upgrader.php (working copy) @@ -137,7 +137,7 @@ } $wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE); - require_once( ABSPATH . 'wp-admin/includes/update-core.php' ); + require_once( ABSPATH . WPADMIN . '/includes/update-core.php' ); if ( ! function_exists( 'update_core' ) ) { WP_Upgrader::release_lock( 'core_updater' ); Index: src/wp-admin/includes/class-wp-filesystem-ftpsockets.php =================================================================== --- src/wp-admin/includes/class-wp-filesystem-ftpsockets.php (revision 41634) +++ src/wp-admin/includes/class-wp-filesystem-ftpsockets.php (working copy) @@ -28,7 +28,7 @@ $this->errors = new WP_Error(); // Check if possible to use ftp functions. - if ( ! @include_once( ABSPATH . 'wp-admin/includes/class-ftp.php' ) ) { + if ( ! @include_once( ABSPATH . WPADMIN . '/includes/class-ftp.php' ) ) { return; } $this->ftp = new ftp(); Index: src/wp-admin/includes/class-wp-plugin-install-list-table.php =================================================================== --- src/wp-admin/includes/class-wp-plugin-install-list-table.php (revision 41634) +++ src/wp-admin/includes/class-wp-plugin-install-list-table.php (working copy) @@ -87,7 +87,7 @@ * @global string $term */ public function prepare_items() { - include( ABSPATH . 'wp-admin/includes/plugin-install.php' ); + include( ABSPATH . WPADMIN . '/includes/plugin-install.php' ); global $tabs, $tab, $paged, $type, $term; Index: src/wp-admin/includes/class-wp-theme-install-list-table.php =================================================================== --- src/wp-admin/includes/class-wp-theme-install-list-table.php (revision 41634) +++ src/wp-admin/includes/class-wp-theme-install-list-table.php (working copy) @@ -36,7 +36,7 @@ * @global array $theme_field_defaults */ public function prepare_items() { - include( ABSPATH . 'wp-admin/includes/theme-install.php' ); + include( ABSPATH . WPADMIN . '/includes/theme-install.php' ); global $tabs, $tab, $paged, $type, $theme_field_defaults; wp_reset_vars( array( 'tab' ) ); Index: src/wp-admin/includes/class-wp-upgrader-skins.php =================================================================== --- src/wp-admin/includes/class-wp-upgrader-skins.php (revision 41634) +++ src/wp-admin/includes/class-wp-upgrader-skins.php (working copy) @@ -10,34 +10,34 @@ _deprecated_file( basename( __FILE__ ), '4.7.0', 'class-wp-upgrader.php' ); /** WP_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-wp-upgrader-skin.php'; /** Plugin_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-plugin-upgrader-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-plugin-upgrader-skin.php'; /** Theme_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-theme-upgrader-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-theme-upgrader-skin.php'; /** Bulk_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-bulk-upgrader-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-bulk-upgrader-skin.php'; /** Bulk_Plugin_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-bulk-plugin-upgrader-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-bulk-plugin-upgrader-skin.php'; /** Bulk_Theme_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-bulk-theme-upgrader-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-bulk-theme-upgrader-skin.php'; /** Plugin_Installer_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-plugin-installer-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-plugin-installer-skin.php'; /** Theme_Installer_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-theme-installer-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-theme-installer-skin.php'; /** Language_Pack_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-language-pack-upgrader-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-language-pack-upgrader-skin.php'; /** Automatic_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-automatic-upgrader-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-automatic-upgrader-skin.php'; /** WP_Ajax_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-wp-ajax-upgrader-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-wp-ajax-upgrader-skin.php'; Index: src/wp-admin/includes/class-wp-upgrader.php =================================================================== --- src/wp-admin/includes/class-wp-upgrader.php (revision 41634) +++ src/wp-admin/includes/class-wp-upgrader.php (working copy) @@ -10,37 +10,37 @@ */ /** WP_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-wp-upgrader-skin.php'; /** Plugin_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-plugin-upgrader-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-plugin-upgrader-skin.php'; /** Theme_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-theme-upgrader-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-theme-upgrader-skin.php'; /** Bulk_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-bulk-upgrader-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-bulk-upgrader-skin.php'; /** Bulk_Plugin_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-bulk-plugin-upgrader-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-bulk-plugin-upgrader-skin.php'; /** Bulk_Theme_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-bulk-theme-upgrader-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-bulk-theme-upgrader-skin.php'; /** Plugin_Installer_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-plugin-installer-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-plugin-installer-skin.php'; /** Theme_Installer_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-theme-installer-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-theme-installer-skin.php'; /** Language_Pack_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-language-pack-upgrader-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-language-pack-upgrader-skin.php'; /** Automatic_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-automatic-upgrader-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-automatic-upgrader-skin.php'; /** WP_Ajax_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-wp-ajax-upgrader-skin.php'; +require_once ABSPATH . WPADMIN . '/includes/class-wp-ajax-upgrader-skin.php'; /** * Core class used for upgrading/installing a local set of files via @@ -871,19 +871,19 @@ } /** Plugin_Upgrader class */ -require_once ABSPATH . 'wp-admin/includes/class-plugin-upgrader.php'; +require_once ABSPATH . WPADMIN . '/includes/class-plugin-upgrader.php'; /** Theme_Upgrader class */ -require_once ABSPATH . 'wp-admin/includes/class-theme-upgrader.php'; +require_once ABSPATH . WPADMIN . '/includes/class-theme-upgrader.php'; /** Language_Pack_Upgrader class */ -require_once ABSPATH . 'wp-admin/includes/class-language-pack-upgrader.php'; +require_once ABSPATH . WPADMIN . '/includes/class-language-pack-upgrader.php'; /** Core_Upgrader class */ -require_once ABSPATH . 'wp-admin/includes/class-core-upgrader.php'; +require_once ABSPATH . WPADMIN . '/includes/class-core-upgrader.php'; /** File_Upload_Upgrader class */ -require_once ABSPATH . 'wp-admin/includes/class-file-upload-upgrader.php'; +require_once ABSPATH . WPADMIN . '/includes/class-file-upload-upgrader.php'; /** WP_Automatic_Updater class */ -require_once ABSPATH . 'wp-admin/includes/class-wp-automatic-updater.php'; +require_once ABSPATH . WPADMIN . '/includes/class-wp-automatic-updater.php'; Index: src/wp-admin/includes/comment.php =================================================================== --- src/wp-admin/includes/comment.php (revision 41634) +++ src/wp-admin/includes/comment.php (working copy) @@ -191,6 +191,6 @@ */ function comment_footer_die( $msg ) { echo "

$msg

"; - include( ABSPATH . 'wp-admin/admin-footer.php' ); + include( ABSPATH . WPADMIN . '/admin-footer.php' ); die; } \ No newline at end of file Index: src/wp-admin/includes/deprecated.php =================================================================== --- src/wp-admin/includes/deprecated.php (revision 41634) +++ src/wp-admin/includes/deprecated.php (working copy) @@ -1154,7 +1154,7 @@ if ( !empty($feedback) ) add_filter('update_feedback', $feedback); - include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); + include( ABSPATH . WPADMIN . '/includes/class-wp-upgrader.php' ); $upgrader = new Core_Upgrader(); return $upgrader->upgrade($current); @@ -1177,7 +1177,7 @@ if ( !empty($feedback) ) add_filter('update_feedback', $feedback); - include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); + include( ABSPATH . WPADMIN . '/includes/class-wp-upgrader.php' ); $upgrader = new Plugin_Upgrader(); return $upgrader->upgrade($plugin); } @@ -1199,7 +1199,7 @@ if ( !empty($feedback) ) add_filter('update_feedback', $feedback); - include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); + include( ABSPATH . WPADMIN . '/includes/class-wp-upgrader.php' ); $upgrader = new Theme_Upgrader(); return $upgrader->upgrade($theme); } Index: src/wp-admin/includes/file.php =================================================================== --- src/wp-admin/includes/file.php (revision 41634) +++ src/wp-admin/includes/file.php (working copy) @@ -760,7 +760,7 @@ mbstring_binary_safe_encoding(); - require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php'); + require_once(ABSPATH . WPADMIN . '/includes/class-pclzip.php'); $archive = new PclZip($file); @@ -913,7 +913,7 @@ function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_ownership = false ) { global $wp_filesystem; - require_once(ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php'); + require_once(ABSPATH . WPADMIN . '/includes/class-wp-filesystem-base.php'); $method = get_filesystem_method( $args, $context, $allow_relaxed_file_ownership ); @@ -932,7 +932,7 @@ * @param string $path Path to the specific filesystem method class file. * @param string $method The filesystem method to use. */ - $abstraction_file = apply_filters( 'filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method ); + $abstraction_file = apply_filters( 'filesystem_method_file', ABSPATH . WPADMIN . '/includes/class-wp-filesystem-' . $method . '.php', $method ); if ( ! file_exists($abstraction_file) ) return; Index: src/wp-admin/includes/list-table.php =================================================================== --- src/wp-admin/includes/list-table.php (revision 41634) +++ src/wp-admin/includes/list-table.php (working copy) @@ -41,7 +41,7 @@ if ( isset( $core_classes[ $class ] ) ) { foreach ( (array) $core_classes[ $class ] as $required ) - require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' ); + require_once( ABSPATH . WPADMIN . '/includes/class-wp-' . $required . '-list-table.php' ); if ( isset( $args['screen'] ) ) $args['screen'] = convert_to_screen( $args['screen'] ); Index: src/wp-admin/includes/media.php =================================================================== --- src/wp-admin/includes/media.php (revision 41634) +++ src/wp-admin/includes/media.php (working copy) @@ -2720,7 +2720,7 @@ function edit_form_image_editor( $post ) { $open = isset( $_GET['image-editor'] ); if ( $open ) - require_once ABSPATH . 'wp-admin/includes/image-edit.php'; + require_once ABSPATH . WPADMIN . '/includes/image-edit.php'; $thumb_url = false; if ( $attachment_id = intval( $post->ID ) ) Index: src/wp-admin/includes/nav-menu.php =================================================================== --- src/wp-admin/includes/nav-menu.php (revision 41634) +++ src/wp-admin/includes/nav-menu.php (working copy) @@ -8,10 +8,10 @@ */ /** Walker_Nav_Menu_Edit class */ -require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-edit.php' ); +require_once( ABSPATH . WPADMIN . '/includes/class-walker-nav-menu-edit.php' ); /** Walker_Nav_Menu_Checklist class */ -require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-checklist.php' ); +require_once( ABSPATH . WPADMIN . '/includes/class-walker-nav-menu-checklist.php' ); /** * Prints the appropriate response to a menu quick search. Index: src/wp-admin/includes/network.php =================================================================== --- src/wp-admin/includes/network.php (revision 41634) +++ src/wp-admin/includes/network.php (working copy) @@ -104,7 +104,7 @@ if ( defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) { echo '

' . __('ERROR:') . ' ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '

'; echo '
'; - include( ABSPATH . 'wp-admin/admin-footer.php' ); + include( ABSPATH . WPADMIN . '/admin-footer.php' ); die(); } @@ -112,7 +112,7 @@ if ( ! empty( $active_plugins ) ) { echo '

' . __('Warning:') . ' ' . sprintf( __( 'Please deactivate your plugins before enabling the Network feature.' ), admin_url( 'plugins.php?plugin_status=active' ) ) . '

' . __( 'Once the network is created, you may reactivate your plugins.' ) . '

'; echo '
'; - include( ABSPATH . 'wp-admin/admin-footer.php' ); + include( ABSPATH . WPADMIN . '/admin-footer.php' ); die(); } @@ -127,7 +127,7 @@ ) . '

'; echo '' . __( 'Return to Dashboard' ) . ''; echo '
'; - include( ABSPATH . 'wp-admin/admin-footer.php' ); + include( ABSPATH . WPADMIN . '/admin-footer.php' ); die(); } @@ -485,7 +485,7 @@ $iis_subdir_match = ltrim( $base, '/' ) . $subdir_match; $iis_rewrite_base = ltrim( $base, '/' ) . $rewrite_base; $iis_subdir_replacement = $subdomain_install ? '' : '{R:1}'; - + $wp_admin = WPADMIN; $web_config_file = ' @@ -504,8 +504,8 @@ } $web_config_file .= ' - - + + @@ -555,14 +555,14 @@ $ms_files_rewriting = "\n# uploaded files\nRewriteRule ^"; $ms_files_rewriting .= $subdir_match . "files/(.+) {$rewrite_base}" . WPINC . "/ms-files.php?file={$subdir_replacement_12} [L]" . "\n"; } - + $wp_admin = WPADMIN; $htaccess_file = <<type = 'core'; @@ -249,7 +249,7 @@ return false; } - require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; + require_once ABSPATH . WPADMIN . '/includes/class-wp-upgrader.php'; $skin = new Automatic_Upgrader_Skin; $upgrader = new Language_Pack_Upgrader( $skin ); $upgrader->init(); Index: src/wp-admin/includes/update-core.php =================================================================== --- src/wp-admin/includes/update-core.php (revision 41634) +++ src/wp-admin/includes/update-core.php (working copy) @@ -1257,7 +1257,7 @@ updates ) ) return false; - include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); + include_once( ABSPATH . WPADMIN . '/includes/class-wp-upgrader.php' ); $auto_update = false; $upgrader = new WP_Automatic_Updater; Index: src/wp-admin/includes/upgrade.php =================================================================== --- src/wp-admin/includes/upgrade.php (revision 41634) +++ src/wp-admin/includes/upgrade.php (working copy) @@ -13,10 +13,10 @@ require (WP_CONTENT_DIR . '/install.php'); /** WordPress Administration API */ -require_once(ABSPATH . 'wp-admin/includes/admin.php'); +require_once(ABSPATH . WPADMIN . '/includes/admin.php'); /** WordPress Schema API */ -require_once(ABSPATH . 'wp-admin/includes/schema.php'); +require_once(ABSPATH . WPADMIN . '/includes/schema.php'); if ( !function_exists('wp_install') ) : /** Index: src/wp-admin/index.php =================================================================== --- src/wp-admin/index.php (revision 41634) +++ src/wp-admin/index.php (working copy) @@ -10,7 +10,7 @@ require_once( dirname( __FILE__ ) . '/admin.php' ); /** Load WordPress dashboard API */ -require_once(ABSPATH . 'wp-admin/includes/dashboard.php'); +require_once(ABSPATH . WPADMIN . '/includes/dashboard.php'); wp_dashboard_setup(); @@ -99,7 +99,7 @@ '

' . __( 'Support Forums' ) . '

' ); -include( ABSPATH . 'wp-admin/admin-header.php' ); +include( ABSPATH . WPADMIN . '/admin-header.php' ); ?>
@@ -141,4 +141,4 @@ __( 'Links list' ), ) ); -include_once( ABSPATH . 'wp-admin/admin-header.php' ); +include_once( ABSPATH . WPADMIN . '/admin-header.php' ); if ( ! current_user_can('manage_links') ) wp_die(__('Sorry, you are not allowed to edit the links for this site.')); @@ -116,4 +116,4 @@
' . __('Support Forums') . '

' ); -require_once( ABSPATH . 'wp-admin/admin-header.php' ); +require_once( ABSPATH . WPADMIN . '/admin-header.php' ); $form_class = 'media-upload-form type-form validate'; @@ -81,4 +81,4 @@
' . __('Support Forums') . '

' ); - require( ABSPATH . 'wp-admin/admin-header.php' ); + require( ABSPATH . WPADMIN . '/admin-header.php' ); $parent_file = 'upload.php'; $message = ''; @@ -138,7 +138,7 @@ $arrow
$img
$title
"; } else { @@ -163,7 +163,7 @@ $menu_file = $item[2]; if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) $menu_file = substr( $menu_file, 0, $pos ); - if ( ! empty( $menu_hook ) || ( ( 'index.php' != $item[2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) { + if ( ! empty( $menu_hook ) || ( ( 'index.php' != $item[2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/" . WPADMIN . "/$menu_file" ) ) ) { $admin_is_parent = true; echo "\n\t$arrow
$img
{$item[0]}
"; } else { @@ -225,7 +225,7 @@ $title = wptexturize($sub_item[0]); - if ( ! empty( $menu_hook ) || ( ( 'index.php' != $sub_item[2] ) && file_exists( WP_PLUGIN_DIR . "/$sub_file" ) && ! file_exists( ABSPATH . "/wp-admin/$sub_file" ) ) ) { + if ( ! empty( $menu_hook ) || ( ( 'index.php' != $sub_item[2] ) && file_exists( WP_PLUGIN_DIR . "/$sub_file" ) && ! file_exists( ABSPATH . "/" . WPADMIN . "/$sub_file" ) ) ) { // If admin.php is the current page or if the parent exists as a file in the plugins or admin dir if ( ( ! $admin_is_parent && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! is_dir( WP_PLUGIN_DIR . "/{$item[2]}" ) ) || file_exists( $menu_file ) ) $sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), $item[2] ); Index: src/wp-admin/menu.php =================================================================== --- src/wp-admin/menu.php (revision 41634) +++ src/wp-admin/menu.php (working copy) @@ -283,4 +283,4 @@ 'themes' => 'appearance', ); -require_once(ABSPATH . 'wp-admin/includes/menu.php'); +require_once(ABSPATH . WPADMIN . '/includes/menu.php'); Index: src/wp-admin/ms-delete-site.php =================================================================== --- src/wp-admin/ms-delete-site.php (revision 41634) +++ src/wp-admin/ms-delete-site.php (working copy) @@ -29,7 +29,7 @@ $title = __( 'Delete Site' ); $parent_file = 'tools.php'; -require_once( ABSPATH . 'wp-admin/admin-header.php' ); +require_once( ABSPATH . WPADMIN . '/admin-header.php' ); echo '
'; echo '

' . esc_html( $title ) . '

'; @@ -104,4 +104,4 @@ } echo '
'; -include( ABSPATH . 'wp-admin/admin-footer.php' ); +include( ABSPATH . WPADMIN . '/admin-footer.php' ); Index: src/wp-admin/my-sites.php =================================================================== --- src/wp-admin/my-sites.php (revision 41634) +++ src/wp-admin/my-sites.php (working copy) @@ -48,7 +48,7 @@ '

' . __('Support Forums') . '

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

@@ -135,4 +135,4 @@

@@ -852,4 +852,4 @@
- + Index: src/wp-admin/network/about.php =================================================================== --- src/wp-admin/network/about.php (revision 41634) +++ src/wp-admin/network/about.php (working copy) @@ -10,4 +10,4 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -require( ABSPATH . 'wp-admin/about.php' ); +require( ABSPATH . WPADMIN . '/about.php' ); Index: src/wp-admin/network/credits.php =================================================================== --- src/wp-admin/network/credits.php (revision 41634) +++ src/wp-admin/network/credits.php (working copy) @@ -10,4 +10,4 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -require( ABSPATH . 'wp-admin/credits.php' ); +require( ABSPATH . WPADMIN . '/credits.php' ); Index: src/wp-admin/network/freedoms.php =================================================================== --- src/wp-admin/network/freedoms.php (revision 41634) +++ src/wp-admin/network/freedoms.php (working copy) @@ -10,4 +10,4 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -require( ABSPATH . 'wp-admin/freedoms.php' ); +require( ABSPATH . WPADMIN . '/freedoms.php' ); Index: src/wp-admin/network/index.php =================================================================== --- src/wp-admin/network/index.php (revision 41634) +++ src/wp-admin/network/index.php (working copy) @@ -11,7 +11,7 @@ require_once( dirname( __FILE__ ) . '/admin.php' ); /** Load WordPress dashboard API */ -require_once( ABSPATH . 'wp-admin/includes/dashboard.php' ); +require_once( ABSPATH . WPADMIN . '/includes/dashboard.php' ); if ( ! current_user_can( 'manage_network' ) ) wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 ); @@ -57,7 +57,7 @@ wp_enqueue_script( 'plugin-install' ); add_thickbox(); -require_once( ABSPATH . 'wp-admin/admin-header.php' ); +require_once( ABSPATH . WPADMIN . '/admin-header.php' ); ?> @@ -75,4 +75,4 @@

- + Index: src/wp-admin/network/setup.php =================================================================== --- src/wp-admin/network/setup.php (revision 41634) +++ src/wp-admin/network/setup.php (working copy) @@ -10,4 +10,4 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -require( ABSPATH . 'wp-admin/network.php' ); +require( ABSPATH . WPADMIN . '/network.php' ); Index: src/wp-admin/network/site-info.php =================================================================== --- src/wp-admin/network/site-info.php (revision 41634) +++ src/wp-admin/network/site-info.php (working copy) @@ -119,7 +119,7 @@ $parent_file = 'sites.php'; $submenu_file = 'sites.php'; -require( ABSPATH . 'wp-admin/admin-header.php' ); +require( ABSPATH . WPADMIN . '/admin-header.php' ); ?> @@ -194,4 +194,4 @@ @@ -264,4 +264,4 @@ @@ -154,4 +154,4 @@ +require( ABSPATH . WPADMIN . '/admin-header.php' ); ?>

@@ -204,4 +204,4 @@
- + Index: src/wp-admin/network/site-users.php =================================================================== --- src/wp-admin/network/site-users.php (revision 41634) +++ src/wp-admin/network/site-users.php (working copy) @@ -208,7 +208,7 @@ if ( ! wp_is_large_network( 'users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) ) wp_enqueue_script( 'user-suggest' ); -require( ABSPATH . 'wp-admin/admin-header.php' ); ?> +require( ABSPATH . WPADMIN . '/admin-header.php' ); ?>
@@ -352,7 +352,7 @@ else $userids = $_REQUEST['users']; - include( ABSPATH . 'wp-admin/admin-header.php' ); + include( ABSPATH . WPADMIN . '/admin-header.php' ); ?> @@ -421,7 +421,7 @@ exit; } - include( ABSPATH . 'wp-admin/admin-header.php' ); + include( ABSPATH . WPADMIN . '/admin-header.php' ); $messages = array(); if ( isset($_GET['update']) ) : @@ -523,4 +523,4 @@ } // end of the $doaction switch -include( ABSPATH . 'wp-admin/admin-footer.php' ); +include( ABSPATH . WPADMIN . '/admin-footer.php' ); Index: src/wp-admin/widgets.php =================================================================== --- src/wp-admin/widgets.php (revision 41634) +++ src/wp-admin/widgets.php (working copy) @@ -10,7 +10,7 @@ require_once( dirname( __FILE__ ) . '/admin.php' ); /** WordPress Administration Widgets API */ -require_once(ABSPATH . 'wp-admin/includes/widgets.php'); +require_once(ABSPATH . WPADMIN . '/includes/widgets.php'); if ( ! current_user_can( 'edit_theme_options' ) ) { wp_die( @@ -264,7 +264,7 @@ $width = ' style="width:' . max($control['width'], 350) . 'px"'; $key = isset($_GET['key']) ? (int) $_GET['key'] : 0; - require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?> + require_once( ABSPATH . WPADMIN . '/admin-header.php' ); ?>

> @@ -330,7 +330,7 @@
+require_once( ABSPATH . WPADMIN . '/admin-header.php' ); ?>

$attachment ) { @@ -4172,7 +4172,7 @@ 'capability' => 'switch_themes', ) ) ); - require_once( ABSPATH . 'wp-admin/includes/theme.php' ); + require_once( ABSPATH . WPADMIN . '/includes/theme.php' ); // Theme Controls. Index: src/wp-includes/class-wp-customize-widgets.php =================================================================== --- src/wp-includes/class-wp-customize-widgets.php (revision 41634) +++ src/wp-includes/class-wp-customize-widgets.php (working copy) @@ -923,7 +923,7 @@ } global $wp_registered_widgets, $wp_registered_widget_controls; - require_once ABSPATH . '/wp-admin/includes/widgets.php'; // for next_widget_id_number() + require_once ABSPATH . '/' . WPADMIN . '/includes/widgets.php'; // for next_widget_id_number() $sort = $wp_registered_widgets; usort( $sort, array( $this, '_sort_name_callback' ) ); Index: src/wp-includes/class-wp-editor.php =================================================================== --- src/wp-includes/class-wp-editor.php (revision 41634) +++ src/wp-includes/class-wp-editor.php (working copy) @@ -212,7 +212,7 @@ self::$has_medialib = true; if ( ! function_exists( 'media_buttons' ) ) - include( ABSPATH . 'wp-admin/includes/media.php' ); + include( ABSPATH . WPADMIN . '/includes/media.php' ); echo '
'; Index: src/wp-includes/customize/class-wp-customize-header-image-setting.php =================================================================== --- src/wp-includes/customize/class-wp-customize-header-image-setting.php (revision 41634) +++ src/wp-includes/customize/class-wp-customize-header-image-setting.php (working copy) @@ -31,7 +31,7 @@ // If _custom_header_background_just_in_time() fails to initialize $custom_image_header when not is_admin(). if ( empty( $custom_image_header ) ) { - require_once( ABSPATH . 'wp-admin/custom-header.php' ); + require_once( ABSPATH . WPADMIN . '/custom-header.php' ); $args = get_theme_support( 'custom-header' ); $admin_head_callback = isset( $args[0]['admin-head-callback'] ) ? $args[0]['admin-head-callback'] : null; $admin_preview_callback = isset( $args[0]['admin-preview-callback'] ) ? $args[0]['admin-preview-callback'] : null; Index: src/wp-includes/customize/class-wp-customize-nav-menus-panel.php =================================================================== --- src/wp-includes/customize/class-wp-customize-nav-menus-panel.php (revision 41634) +++ src/wp-includes/customize/class-wp-customize-nav-menus-panel.php (working copy) @@ -33,7 +33,7 @@ */ public function render_screen_options() { // Adds the screen options. - require_once ABSPATH . 'wp-admin/includes/nav-menu.php'; + require_once ABSPATH . WPADMIN . '/includes/nav-menu.php'; add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns' ); // Display screen options. @@ -51,7 +51,7 @@ */ public function wp_nav_menu_manage_columns() { _deprecated_function( __METHOD__, '4.5.0', 'wp_nav_menu_manage_columns' ); - require_once ABSPATH . 'wp-admin/includes/nav-menu.php'; + require_once ABSPATH . WPADMIN . '/includes/nav-menu.php'; return wp_nav_menu_manage_columns(); } Index: src/wp-includes/customize/class-wp-widget-form-customize-control.php =================================================================== --- src/wp-includes/customize/class-wp-widget-form-customize-control.php (revision 41634) +++ src/wp-includes/customize/class-wp-widget-form-customize-control.php (working copy) @@ -41,7 +41,7 @@ } // Get the widget_control and widget_content. - require_once ABSPATH . '/wp-admin/includes/widgets.php'; + require_once ABSPATH . '/' . WPADMIN . '/includes/widgets.php'; $widget = $wp_registered_widgets[ $this->widget_id ]; if ( ! isset( $widget['params'][0] ) ) { Index: src/wp-includes/default-constants.php =================================================================== --- src/wp-includes/default-constants.php (revision 41634) +++ src/wp-includes/default-constants.php (working copy) @@ -260,7 +260,7 @@ * @since 2.6.0 */ if ( !defined('ADMIN_COOKIE_PATH') ) - define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' ); + define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . WPADMIN ); /** * @since 2.6.0 Index: src/wp-includes/functions.php =================================================================== --- src/wp-includes/functions.php (revision 41634) +++ src/wp-includes/functions.php (working copy) @@ -4307,8 +4307,8 @@ $script_filename_dir = dirname( $_SERVER['SCRIPT_FILENAME'] ); // The request is for the admin - if ( strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) !== false || strpos( $_SERVER['REQUEST_URI'], 'wp-login.php' ) !== false ) { - $path = preg_replace( '#/(wp-admin/.*|wp-login.php)#i', '', $_SERVER['REQUEST_URI'] ); + if ( strpos( $_SERVER['REQUEST_URI'], WPADMIN ) !== false || strpos( $_SERVER['REQUEST_URI'], 'wp-login.php' ) !== false ) { + $path = preg_replace( '#/(' . WPADMIN . '/.*|wp-login.php)#i', '', $_SERVER['REQUEST_URI'] ); // The request is for a file in ABSPATH } elseif ( $script_filename_dir . '/' == $abspath_fix ) { Index: src/wp-includes/general-template.php =================================================================== --- src/wp-includes/general-template.php (revision 41634) +++ src/wp-includes/general-template.php (working copy) @@ -3939,7 +3939,7 @@ * @param string $file file relative to wp-admin/ without its ".css" extension. * @return string */ -function wp_admin_css_uri( $file = 'wp-admin' ) { +function wp_admin_css_uri( $file = WPADMIN ) { if ( defined('WP_INSTALLING') ) { $_file = "./$file.css"; } else { @@ -3978,7 +3978,7 @@ * to wp-admin/. Defaults to 'wp-admin'. * @param bool $force_echo Optional. Force the stylesheet link to be printed rather than enqueued. */ -function wp_admin_css( $file = 'wp-admin', $force_echo = false ) { +function wp_admin_css( $file = WPADMIN, $force_echo = false ) { // For backward compatibility $handle = 0 === strpos( $file, 'css/' ) ? substr( $file, 4 ) : $file; Index: src/wp-includes/l10n.php =================================================================== --- src/wp-includes/l10n.php (revision 41634) +++ src/wp-includes/l10n.php (working copy) @@ -1151,7 +1151,7 @@ $translations = $args['translations']; if ( empty( $translations ) ) { - require_once( ABSPATH . 'wp-admin/includes/translation-install.php' ); + require_once( ABSPATH . WPADMIN . '/includes/translation-install.php' ); $translations = wp_get_available_translations(); } Index: src/wp-includes/link-template.php =================================================================== --- src/wp-includes/link-template.php (revision 41634) +++ src/wp-includes/link-template.php (working copy) @@ -3063,7 +3063,7 @@ * @return string Admin URL link with optional path appended. */ function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) { - $url = get_site_url($blog_id, 'wp-admin/', $scheme); + $url = get_site_url($blog_id, WPADMIN . '/', $scheme); if ( $path && is_string( $path ) ) $url .= ltrim( $path, '/' ); @@ -3289,7 +3289,7 @@ if ( ! is_multisite() ) return admin_url( $path, $scheme ); - $url = network_site_url('wp-admin/network/', $scheme); + $url = network_site_url(WPADMIN . '/network/', $scheme); if ( $path && is_string( $path ) ) $url .= ltrim($path, '/'); @@ -3317,7 +3317,7 @@ * @return string Admin URL link with optional path appended. */ function user_admin_url( $path = '', $scheme = 'admin' ) { - $url = network_site_url('wp-admin/user/', $scheme); + $url = network_site_url(WPADMIN . '/user/', $scheme); if ( $path && is_string( $path ) ) $url .= ltrim($path, '/'); Index: src/wp-includes/load.php =================================================================== --- src/wp-includes/load.php (revision 41634) +++ src/wp-includes/load.php (working copy) @@ -544,7 +544,7 @@ require( ABSPATH . WPINC . '/pluggable.php' ); require( ABSPATH . WPINC . '/formatting.php' ); - $link = wp_guess_url() . '/wp-admin/install.php'; + $link = wp_guess_url() . '/' . WPADMIN . '/install.php'; wp_redirect( $link ); die(); Index: src/wp-includes/ms-default-constants.php =================================================================== --- src/wp-includes/ms-default-constants.php (revision 41634) +++ src/wp-includes/ms-default-constants.php (working copy) @@ -68,7 +68,7 @@ if ( ! is_subdomain_install() || trim( parse_url( get_option( 'siteurl' ), PHP_URL_PATH ), '/' ) ) { define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH ); } else { - define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' ); + define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . WPADMIN ); } } Index: src/wp-includes/ms-functions.php =================================================================== --- src/wp-includes/ms-functions.php (revision 41634) +++ src/wp-includes/ms-functions.php (working copy) @@ -1437,7 +1437,7 @@ // Cast for security $blog_id = (int) $blog_id; - require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); + require_once( ABSPATH . WPADMIN . '/includes/upgrade.php' ); $suppress = $wpdb->suppress_errors(); if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) ) @@ -1501,7 +1501,7 @@ function install_blog_defaults($blog_id, $user_id) { global $wpdb; - require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); + require_once( ABSPATH . WPADMIN . '/includes/upgrade.php' ); $suppress = $wpdb->suppress_errors(); @@ -2586,7 +2586,7 @@ */ function get_subdirectory_reserved_names() { $names = array( - 'page', 'comments', 'blog', 'files', 'feed', 'wp-admin', + 'page', 'comments', 'blog', 'files', 'feed', WPADMIN, 'wp-content', 'wp-includes', 'wp-json', 'embed' ); Index: src/wp-includes/pluggable.php =================================================================== --- src/wp-includes/pluggable.php (revision 41634) +++ src/wp-includes/pluggable.php (working copy) @@ -1006,7 +1006,7 @@ $secure = apply_filters( 'secure_auth_redirect', $secure ); // If https is required and request is http, redirect - if ( $secure && !is_ssl() && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin') ) { + if ( $secure && !is_ssl() && false !== strpos($_SERVER['REQUEST_URI'], WPADMIN) ) { if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) { wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) ); exit(); @@ -1036,7 +1036,7 @@ do_action( 'auth_redirect', $user_id ); // If the user wants ssl but the session is not ssl, redirect. - if ( !$secure && get_user_option('use_ssl', $user_id) && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin') ) { + if ( !$secure && get_user_option('use_ssl', $user_id) && false !== strpos($_SERVER['REQUEST_URI'], WPADMIN) ) { if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) { wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) ); exit(); Index: src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php =================================================================== --- src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php (revision 41634) +++ src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php (working copy) @@ -170,7 +170,7 @@ do_action( 'rest_insert_attachment', $attachment, $request, true ); // Include admin functions to get access to wp_generate_attachment_metadata(). - require_once ABSPATH . 'wp-admin/includes/admin.php'; + require_once ABSPATH . WPADMIN . '/includes/admin.php'; wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) ); @@ -512,7 +512,7 @@ $type = array_shift( $headers['content_type'] ); /** Include admin functions to get access to wp_tempnam() and wp_handle_sideload() */ - require_once ABSPATH . 'wp-admin/includes/admin.php'; + require_once ABSPATH . WPADMIN . '/includes/admin.php'; // Save the file. $tmpfname = wp_tempnam( $filename ); @@ -702,7 +702,7 @@ } /** Include admin functions to get access to wp_handle_upload() */ - require_once ABSPATH . 'wp-admin/includes/admin.php'; + require_once ABSPATH . WPADMIN . '/includes/admin.php'; $file = wp_handle_upload( $files['file'], $overrides ); Index: src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php =================================================================== --- src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php (revision 41634) +++ src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php (working copy) @@ -755,7 +755,7 @@ $previous = $this->prepare_item_for_response( $user, $request ); /** Include admin user functions to get access to wp_delete_user() */ - require_once ABSPATH . 'wp-admin/includes/user.php'; + require_once ABSPATH . WPADMIN . '/includes/user.php'; $result = wp_delete_user( $id, $reassign ); @@ -1052,7 +1052,7 @@ } /** Include admin functions to get access to get_editable_roles() */ - require_once ABSPATH . 'wp-admin/includes/admin.php'; + require_once ABSPATH . WPADMIN . '/includes/admin.php'; // The new role must be editable by the logged-in user. $editable_roles = get_editable_roles(); Index: src/wp-includes/script-loader.php =================================================================== --- src/wp-includes/script-loader.php (revision 41634) +++ src/wp-includes/script-loader.php (working copy) @@ -62,7 +62,7 @@ $scripts->base_url = $guessurl; $scripts->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : ''; $scripts->default_version = get_bloginfo( 'version' ); - $scripts->default_dirs = array('/wp-admin/js/', '/wp-includes/js/'); + $scripts->default_dirs = array('/' . WPADMIN . '/js/', '/wp-includes/js/'); $suffix = SCRIPT_DEBUG ? '' : '.min'; $dev_suffix = $develop_src ? '' : '.min'; @@ -75,7 +75,7 @@ 'secure' => (string) ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) ), ) ); - $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), false, 1 ); + $scripts->add( 'common', "/" . WPADMIN . "/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), false, 1 ); did_action( 'init' ) && $scripts->localize( 'common', 'commonL10n', array( 'warnDelete' => __( "You are about to permanently delete these items from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete." ), 'dismiss' => __( 'Dismiss this notice.' ), @@ -124,10 +124,10 @@ $scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' ); - $scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array('utils','jquery'), false, 1 ); + $scripts->add( 'editor', "/" . WPADMIN . "/js/editor$suffix.js", array('utils','jquery'), false, 1 ); // Back-compat for old DFW. To-do: remove at the end of 2016. - $scripts->add( 'wp-fullscreen-stub', "/wp-admin/js/wp-fullscreen-stub$suffix.js", array(), false, 1 ); + $scripts->add( 'wp-fullscreen-stub', "/" . WPADMIN . "/js/wp-fullscreen-stub$suffix.js", array(), false, 1 ); $scripts->add( 'wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array('jquery'), false, 1 ); did_action( 'init' ) && $scripts->localize( 'wp-ajax-response', 'wpAjax', array( @@ -350,7 +350,7 @@ $scripts->add( 'wp-backbone', "/wp-includes/js/wp-backbone$suffix.js", array('backbone', 'wp-util'), false, 1 ); - $scripts->add( 'revisions', "/wp-admin/js/revisions$suffix.js", array( 'wp-backbone', 'jquery-ui-slider', 'hoverIntent' ), false, 1 ); + $scripts->add( 'revisions', "/" . WPADMIN . "/js/revisions$suffix.js", array( 'wp-backbone', 'jquery-ui-slider', 'hoverIntent' ), false, 1 ); $scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), false, 1 ); @@ -470,8 +470,8 @@ $scripts->add( 'jsonlint', '/wp-includes/js/codemirror/jsonlint.js', array(), '1.6.2' ); $scripts->add( 'htmlhint', '/wp-includes/js/codemirror/htmlhint.js', array(), '0.9.14-xwp' ); $scripts->add( 'htmlhint-kses', '/wp-includes/js/codemirror/htmlhint-kses.js', array( 'htmlhint' ) ); - $scripts->add( 'code-editor', "/wp-admin/js/code-editor$suffix.js", array( 'jquery', 'wp-codemirror' ) ); - $scripts->add( 'wp-theme-plugin-editor', "/wp-admin/js/theme-plugin-editor$suffix.js", array( 'code-editor', 'jquery', 'jquery-ui-core', 'wp-a11y', 'underscore' ) ); + $scripts->add( 'code-editor', "/" . WPADMIN . "/js/code-editor$suffix.js", array( 'jquery', 'wp-codemirror' ) ); + $scripts->add( 'wp-theme-plugin-editor', "/" . WPADMIN . "/js/theme-plugin-editor$suffix.js", array( 'code-editor', 'jquery', 'jquery-ui-core', 'wp-a11y', 'underscore' ) ); did_action( 'init' ) && $scripts->add_inline_script( 'wp-theme-plugin-editor', sprintf( 'wp.themePluginEditor.l10n = %s;', wp_json_encode( wp_array_slice_assoc( /* translators: placeholder is error count */ _n_noop( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.' ), @@ -485,7 +485,7 @@ 'src' => empty( $guessed_url ) ? includes_url( '/js/zxcvbn.min.js' ) : $scripts->base_url . '/wp-includes/js/zxcvbn.min.js', ) ); - $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array( 'jquery', 'zxcvbn-async' ), false, 1 ); + $scripts->add( 'password-strength-meter', "/" . WPADMIN . "/js/password-strength-meter$suffix.js", array( 'jquery', 'zxcvbn-async' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'password-strength-meter', 'pwsL10n', array( 'unknown' => _x( 'Password strength unknown', 'password strength' ), 'short' => _x( 'Very weak', 'password strength' ), @@ -495,7 +495,7 @@ 'mismatch' => _x( 'Mismatch', 'password mismatch' ), ) ); - $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter', 'wp-util' ), false, 1 ); + $scripts->add( 'user-profile', "/" . WPADMIN . "/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter', 'wp-util' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'user-profile', 'userProfileL10n', array( 'warn' => __( 'Your new password has not been saved.' ), 'warnWeak' => __( 'Confirm use of weak password' ), @@ -506,9 +506,9 @@ 'ariaHide' => esc_attr__( 'Hide password' ), ) ); - $scripts->add( 'language-chooser', "/wp-admin/js/language-chooser$suffix.js", array( 'jquery' ), false, 1 ); + $scripts->add( 'language-chooser', "/" . WPADMIN . "/js/language-chooser$suffix.js", array( 'jquery' ), false, 1 ); - $scripts->add( 'user-suggest', "/wp-admin/js/user-suggest$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 ); + $scripts->add( 'user-suggest', "/" . WPADMIN . "/js/user-suggest$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 ); $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", array(), false, 1 ); @@ -525,7 +525,7 @@ $scripts->add( 'wpdialogs', "/wp-includes/js/wpdialog$suffix.js", array( 'jquery-ui-dialog' ), false, 1 ); - $scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array(), false, 1 ); + $scripts->add( 'word-count', "/" . WPADMIN . "/js/word-count$suffix.js", array(), false, 1 ); did_action( 'init' ) && $scripts->localize( 'word-count', 'wordCountL10n', array( /* * translators: If your word count is based on single characters (e.g. East Asian characters), @@ -536,7 +536,7 @@ 'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array() ) ); - $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox', 'shortcode' ), false, 1 ); + $scripts->add( 'media-upload', "/" . WPADMIN . "/js/media-upload$suffix.js", array( 'thickbox', 'shortcode' ), false, 1 ); $scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), '1.8.1', 1 ); @@ -545,7 +545,7 @@ $scripts->add( 'customize-preview', "/wp-includes/js/customize-preview$suffix.js", array( 'wp-a11y', 'customize-base' ), false, 1 ); $scripts->add( 'customize-models', "/wp-includes/js/customize-models.js", array( 'underscore', 'backbone' ), false, 1 ); $scripts->add( 'customize-views', "/wp-includes/js/customize-views.js", array( 'jquery', 'underscore', 'imgareaselect', 'customize-models', 'media-editor', 'media-views' ), false, 1 ); - $scripts->add( 'customize-controls', "/wp-admin/js/customize-controls$suffix.js", array( 'customize-base', 'wp-a11y', 'wp-util' ), false, 1 ); + $scripts->add( 'customize-controls', "/" . WPADMIN . "/js/customize-controls$suffix.js", array( 'customize-base', 'wp-a11y', 'wp-util' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'customize-controls', '_wpCustomizeControlsL10n', array( 'activate' => __( 'Activate & Publish' ), 'save' => __( 'Save & Publish' ), // @todo Remove as not required. @@ -590,15 +590,15 @@ ) ); $scripts->add( 'customize-selective-refresh', "/wp-includes/js/customize-selective-refresh$suffix.js", array( 'jquery', 'wp-util', 'customize-preview' ), false, 1 ); - $scripts->add( 'customize-widgets', "/wp-admin/js/customize-widgets$suffix.js", array( 'jquery', 'jquery-ui-sortable', 'jquery-ui-droppable', 'wp-backbone', 'customize-controls' ), false, 1 ); + $scripts->add( 'customize-widgets', "/" . WPADMIN . "/js/customize-widgets$suffix.js", array( 'jquery', 'jquery-ui-sortable', 'jquery-ui-droppable', 'wp-backbone', 'customize-controls' ), false, 1 ); $scripts->add( 'customize-preview-widgets', "/wp-includes/js/customize-preview-widgets$suffix.js", array( 'jquery', 'wp-util', 'customize-preview', 'customize-selective-refresh' ), false, 1 ); - $scripts->add( 'customize-nav-menus', "/wp-admin/js/customize-nav-menus$suffix.js", array( 'jquery', 'wp-backbone', 'customize-controls', 'accordion', 'nav-menu' ), false, 1 ); + $scripts->add( 'customize-nav-menus', "/" . WPADMIN . "/js/customize-nav-menus$suffix.js", array( 'jquery', 'wp-backbone', 'customize-controls', 'accordion', 'nav-menu' ), false, 1 ); $scripts->add( 'customize-preview-nav-menus', "/wp-includes/js/customize-preview-nav-menus$suffix.js", array( 'jquery', 'wp-util', 'customize-preview', 'customize-selective-refresh' ), false, 1 ); $scripts->add( 'wp-custom-header', "/wp-includes/js/wp-custom-header$suffix.js", array( 'wp-a11y' ), false, 1 ); - $scripts->add( 'accordion', "/wp-admin/js/accordion$suffix.js", array( 'jquery' ), false, 1 ); + $scripts->add( 'accordion', "/" . WPADMIN . "/js/accordion$suffix.js", array( 'jquery' ), false, 1 ); $scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 ); $scripts->add( 'media-models', "/wp-includes/js/media-models$suffix.js", array( 'wp-backbone' ), false, 1 ); @@ -621,13 +621,13 @@ $scripts->add( 'wp-api', "/wp-includes/js/wp-api$suffix.js", array( 'jquery', 'backbone', 'underscore', 'wp-api-request' ), false, 1 ); if ( is_admin() ) { - $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array( 'jquery', 'wp-ajax-response' ), false, 1 ); + $scripts->add( 'admin-tags', "/" . WPADMIN . "/js/tags$suffix.js", array( 'jquery', 'wp-ajax-response' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'admin-tags', 'tagsl10n', array( 'noPerm' => __('Sorry, you are not allowed to do that.'), 'broken' => __('An unidentified error has occurred.') )); - $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'quicktags', 'jquery-query'), false, 1 ); + $scripts->add( 'admin-comments', "/" . WPADMIN . "/js/edit-comments$suffix.js", array('wp-lists', 'quicktags', 'jquery-query'), false, 1 ); did_action( 'init' ) && $scripts->localize( 'admin-comments', 'adminCommentsL10n', array( 'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']), 'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']), @@ -640,16 +640,16 @@ 'docTitleCommentsCount' => __( 'Comments (%s)' ), ) ); - $scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array('jquery'), false, 1 ); + $scripts->add( 'xfn', "/" . WPADMIN . "/js/xfn$suffix.js", array('jquery'), false, 1 ); - $scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), false, 1 ); + $scripts->add( 'postbox', "/" . WPADMIN . "/js/postbox$suffix.js", array('jquery-ui-sortable'), false, 1 ); did_action( 'init' ) && $scripts->localize( 'postbox', 'postBoxL10n', array( 'postBoxEmptyString' => __( 'Drag boxes here' ), ) ); - $scripts->add( 'tags-box', "/wp-admin/js/tags-box$suffix.js", array( 'jquery', 'tags-suggest' ), false, 1 ); + $scripts->add( 'tags-box', "/" . WPADMIN . "/js/tags-box$suffix.js", array( 'jquery', 'tags-suggest' ), false, 1 ); - $scripts->add( 'tags-suggest', "/wp-admin/js/tags-suggest$suffix.js", array( 'jquery-ui-autocomplete', 'wp-a11y' ), false, 1 ); + $scripts->add( 'tags-suggest', "/" . WPADMIN . "/js/tags-suggest$suffix.js", array( 'jquery-ui-autocomplete', 'wp-a11y' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'tags-suggest', 'tagsSuggestL10n', array( 'tagDelimiter' => _x( ',', 'tag delimiter' ), 'removeTerm' => __( 'Remove term:' ), @@ -658,7 +658,7 @@ 'termRemoved' => __( 'Term removed.' ), ) ); - $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array( 'suggest', 'wp-lists', 'postbox', 'tags-box', 'underscore', 'word-count', 'wp-a11y' ), false, 1 ); + $scripts->add( 'post', "/" . WPADMIN . "/js/post$suffix.js", array( 'suggest', 'wp-lists', 'postbox', 'tags-box', 'underscore', 'word-count', 'wp-a11y' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'post', 'postL10n', array( 'ok' => __('OK'), 'cancel' => __('Cancel'), @@ -685,11 +685,11 @@ 'permalinkSaved' => __( 'Permalink saved' ), ) ); - $scripts->add( 'editor-expand', "/wp-admin/js/editor-expand$suffix.js", array( 'jquery', 'underscore' ), false, 1 ); + $scripts->add( 'editor-expand', "/" . WPADMIN . "/js/editor-expand$suffix.js", array( 'jquery', 'underscore' ), false, 1 ); - $scripts->add( 'link', "/wp-admin/js/link$suffix.js", array( 'wp-lists', 'postbox' ), false, 1 ); + $scripts->add( 'link', "/" . WPADMIN . "/js/link$suffix.js", array( 'wp-lists', 'postbox' ), false, 1 ); - $scripts->add( 'comment', "/wp-admin/js/comment$suffix.js", array( 'jquery', 'postbox' ) ); + $scripts->add( 'comment', "/" . WPADMIN . "/js/comment$suffix.js", array( 'jquery', 'postbox' ) ); $scripts->add_data( 'comment', 'group', 1 ); did_action( 'init' ) && $scripts->localize( 'comment', 'commentL10n', array( 'submittedOn' => __( 'Submitted on:' ), @@ -697,28 +697,28 @@ 'dateFormat' => __( '%1$s %2$s, %3$s @ %4$s:%5$s' ) ) ); - $scripts->add( 'admin-gallery', "/wp-admin/js/gallery$suffix.js", array( 'jquery-ui-sortable' ) ); + $scripts->add( 'admin-gallery', "/" . WPADMIN . "/js/gallery$suffix.js", array( 'jquery-ui-sortable' ) ); - $scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable' ), false, 1 ); + $scripts->add( 'admin-widgets', "/" . WPADMIN . "/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable' ), false, 1 ); did_action( 'init' ) && $scripts->add_inline_script( 'admin-widgets', sprintf( 'wpWidgets.l10n = %s;', wp_json_encode( array( 'save' => __( 'Save' ), 'saved' => __( 'Saved' ), 'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ), ) ) ) ); - $scripts->add( 'media-widgets', "/wp-admin/js/widgets/media-widgets$suffix.js", array( 'jquery', 'media-models', 'media-views', 'wp-api-request' ) ); + $scripts->add( 'media-widgets', "/" . WPADMIN . "/js/widgets/media-widgets$suffix.js", array( 'jquery', 'media-models', 'media-views', 'wp-api-request' ) ); $scripts->add_inline_script( 'media-widgets', 'wp.mediaWidgets.init();', 'after' ); - $scripts->add( 'media-audio-widget', "/wp-admin/js/widgets/media-audio-widget$suffix.js", array( 'media-widgets', 'media-audiovideo' ) ); - $scripts->add( 'media-image-widget', "/wp-admin/js/widgets/media-image-widget$suffix.js", array( 'media-widgets' ) ); - $scripts->add( 'media-gallery-widget', "/wp-admin/js/widgets/media-gallery-widget$suffix.js", array( 'media-widgets' ) ); - $scripts->add( 'media-video-widget', "/wp-admin/js/widgets/media-video-widget$suffix.js", array( 'media-widgets', 'media-audiovideo', 'wp-api-request' ) ); - $scripts->add( 'text-widgets', "/wp-admin/js/widgets/text-widgets$suffix.js", array( 'jquery', 'backbone', 'editor', 'wp-util', 'wp-a11y' ) ); - $scripts->add( 'custom-html-widgets', "/wp-admin/js/widgets/custom-html-widgets$suffix.js", array( 'code-editor', 'jquery', 'backbone', 'wp-util', 'jquery-ui-core', 'wp-a11y' ) ); + $scripts->add( 'media-audio-widget', "/" . WPADMIN . "/js/widgets/media-audio-widget$suffix.js", array( 'media-widgets', 'media-audiovideo' ) ); + $scripts->add( 'media-image-widget', "/" . WPADMIN . "/js/widgets/media-image-widget$suffix.js", array( 'media-widgets' ) ); + $scripts->add( 'media-gallery-widget', "/" . WPADMIN . "/js/widgets/media-gallery-widget$suffix.js", array( 'media-widgets' ) ); + $scripts->add( 'media-video-widget', "/" . WPADMIN . "/js/widgets/media-video-widget$suffix.js", array( 'media-widgets', 'media-audiovideo', 'wp-api-request' ) ); + $scripts->add( 'text-widgets', "/" . WPADMIN . "/js/widgets/text-widgets$suffix.js", array( 'jquery', 'backbone', 'editor', 'wp-util', 'wp-a11y' ) ); + $scripts->add( 'custom-html-widgets', "/" . WPADMIN . "/js/widgets/custom-html-widgets$suffix.js", array( 'code-editor', 'jquery', 'backbone', 'wp-util', 'jquery-ui-core', 'wp-a11y' ) ); - $scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'wp-backbone', 'wp-a11y' ), false, 1 ); + $scripts->add( 'theme', "/" . WPADMIN . "/js/theme$suffix.js", array( 'wp-backbone', 'wp-a11y' ), false, 1 ); - $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'tags-suggest', 'wp-a11y' ), false, 1 ); + $scripts->add( 'inline-edit-post', "/" . WPADMIN . "/js/inline-edit-post$suffix.js", array( 'jquery', 'tags-suggest', 'wp-a11y' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array( 'error' => __( 'Error while saving the changes.' ), 'ntdeltitle' => __( 'Remove From Bulk Edit' ), @@ -727,20 +727,20 @@ 'saved' => __( 'Changes saved.' ), ) ); - $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 ); + $scripts->add( 'inline-edit-tax', "/" . WPADMIN . "/js/inline-edit-tax$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array( 'error' => __( 'Error while saving the changes.' ), 'saved' => __( 'Changes saved.' ), ) ); - $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'jquery-ui-core', 'thickbox' ), false, 1 ); + $scripts->add( 'plugin-install', "/" . WPADMIN . "/js/plugin-install$suffix.js", array( 'jquery', 'jquery-ui-core', 'thickbox' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'plugin-install', 'plugininstallL10n', array( 'plugin_information' => __( 'Plugin:' ), 'plugin_modal_label' => __( 'Plugin details' ), 'ays' => __('Are you sure you want to install this plugin?') ) ); - $scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery', 'wp-util', 'wp-a11y' ), false, 1 ); + $scripts->add( 'updates', "/" . WPADMIN . "/js/updates$suffix.js", array( 'jquery', 'wp-util', 'wp-a11y' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'updates', '_wpUpdatesSettings', array( 'ajax_nonce' => wp_create_nonce( 'updates' ), 'l10n' => array( @@ -826,10 +826,10 @@ ), ) ); - $scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' ); + $scripts->add( 'farbtastic', '/' . WPADMIN . '/js/farbtastic.js', array('jquery'), '1.2' ); - $scripts->add( 'iris', '/wp-admin/js/iris.min.js', array( 'jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch' ), '1.0.7', 1 ); - $scripts->add( 'wp-color-picker', "/wp-admin/js/color-picker$suffix.js", array( 'iris' ), false, 1 ); + $scripts->add( 'iris', '/' . WPADMIN . '/js/iris.min.js', array( 'jquery-ui-draggable', 'jquery-ui-slider', 'jquery-touch-punch' ), '1.0.7', 1 ); + $scripts->add( 'wp-color-picker', "/" . WPADMIN . "/js/color-picker$suffix.js", array( 'iris' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'wp-color-picker', 'wpColorPickerL10n', array( 'clear' => __( 'Clear' ), 'clearAriaLabel' => __( 'Clear color' ), @@ -839,22 +839,22 @@ 'defaultLabel' => __( 'Color value' ), ) ); - $scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox', 'wp-util', 'wp-a11y' ), false, 1 ); + $scripts->add( 'dashboard', "/" . WPADMIN . "/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox', 'wp-util', 'wp-a11y' ), false, 1 ); $scripts->add( 'list-revisions', "/wp-includes/js/wp-list-revisions$suffix.js" ); $scripts->add( 'media-grid', "/wp-includes/js/media-grid$suffix.js", array( 'media-editor' ), false, 1 ); - $scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery' ), false, 1 ); + $scripts->add( 'media', "/" . WPADMIN . "/js/media$suffix.js", array( 'jquery' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'media', 'attachMediaBoxL10n', array( 'error' => __( 'An error has occurred. Please reload the page and try again.' ), )); - $scripts->add( 'image-edit', "/wp-admin/js/image-edit$suffix.js", array('jquery', 'json2', 'imgareaselect'), false, 1 ); + $scripts->add( 'image-edit', "/" . WPADMIN . "/js/image-edit$suffix.js", array('jquery', 'json2', 'imgareaselect'), false, 1 ); did_action( 'init' ) && $scripts->localize( 'image-edit', 'imageEditL10n', array( 'error' => __( 'Could not load the preview image. Please reload the page and try again.' ) )); - $scripts->add( 'set-post-thumbnail', "/wp-admin/js/set-post-thumbnail$suffix.js", array( 'jquery' ), false, 1 ); + $scripts->add( 'set-post-thumbnail', "/" . WPADMIN . "/js/set-post-thumbnail$suffix.js", array( 'jquery' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'set-post-thumbnail', 'setPostThumbnailL10n', array( 'setThumbnail' => __( 'Use as featured image' ), 'saving' => __( 'Saving...' ), // no ellipsis @@ -863,7 +863,7 @@ ) ); // Navigation Menus - $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox', 'json2' ) ); + $scripts->add( 'nav-menu', "/" . WPADMIN . "/js/nav-menu$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox', 'json2' ) ); did_action( 'init' ) && $scripts->localize( 'nav-menu', 'navMenuL10n', array( 'noResultsFound' => __( 'No results found.' ), 'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ), @@ -871,11 +871,11 @@ 'untitled' => _x( '(no label)', 'missing menu item navigation label' ) ) ); - $scripts->add( 'custom-header', "/wp-admin/js/custom-header.js", array( 'jquery-masonry' ), false, 1 ); - $scripts->add( 'custom-background', "/wp-admin/js/custom-background$suffix.js", array( 'wp-color-picker', 'media-views' ), false, 1 ); - $scripts->add( 'media-gallery', "/wp-admin/js/media-gallery$suffix.js", array('jquery'), false, 1 ); + $scripts->add( 'custom-header', "/" . WPADMIN . "/js/custom-header.js", array( 'jquery-masonry' ), false, 1 ); + $scripts->add( 'custom-background', "/" . WPADMIN . "/js/custom-background$suffix.js", array( 'wp-color-picker', 'media-views' ), false, 1 ); + $scripts->add( 'media-gallery', "/" . WPADMIN . "/js/media-gallery$suffix.js", array('jquery'), false, 1 ); - $scripts->add( 'svg-painter', '/wp-admin/js/svg-painter.js', array( 'jquery' ), false, 1 ); + $scripts->add( 'svg-painter', '/' . WPADMIN . '/js/svg-painter.js', array( 'jquery' ), false, 1 ); } } @@ -907,7 +907,7 @@ $styles->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : ''; $styles->default_version = get_bloginfo( 'version' ); $styles->text_direction = function_exists( 'is_rtl' ) && is_rtl() ? 'rtl' : 'ltr'; - $styles->default_dirs = array('/wp-admin/', '/wp-includes/css/'); + $styles->default_dirs = array( '/' . WPADMIN . '/', '/wp-includes/css/' ); // Open Sans is no longer used by core, but may be relied upon by themes and plugins. $open_sans_font_url = ''; @@ -936,37 +936,37 @@ } // Register a stylesheet for the selected admin color scheme. - $styles->add( 'colors', true, array( 'wp-admin', 'buttons' ) ); + $styles->add( 'colors', true, array( WPADMIN, 'buttons' ) ); $suffix = SCRIPT_DEBUG ? '' : '.min'; // Admin CSS - $styles->add( 'common', "/wp-admin/css/common$suffix.css" ); - $styles->add( 'forms', "/wp-admin/css/forms$suffix.css" ); - $styles->add( 'admin-menu', "/wp-admin/css/admin-menu$suffix.css" ); - $styles->add( 'dashboard', "/wp-admin/css/dashboard$suffix.css" ); - $styles->add( 'list-tables', "/wp-admin/css/list-tables$suffix.css" ); - $styles->add( 'edit', "/wp-admin/css/edit$suffix.css" ); - $styles->add( 'revisions', "/wp-admin/css/revisions$suffix.css" ); - $styles->add( 'media', "/wp-admin/css/media$suffix.css" ); - $styles->add( 'themes', "/wp-admin/css/themes$suffix.css" ); - $styles->add( 'about', "/wp-admin/css/about$suffix.css" ); - $styles->add( 'nav-menus', "/wp-admin/css/nav-menus$suffix.css" ); - $styles->add( 'widgets', "/wp-admin/css/widgets$suffix.css", array( 'wp-pointer' ) ); - $styles->add( 'site-icon', "/wp-admin/css/site-icon$suffix.css" ); - $styles->add( 'l10n', "/wp-admin/css/l10n$suffix.css" ); - $styles->add( 'code-editor', "/wp-admin/css/code-editor$suffix.css", array( 'wp-codemirror' ) ); - - $styles->add( 'wp-admin', false, array( 'dashicons', 'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus', 'widgets', 'site-icon', 'l10n' ) ); - - $styles->add( 'login', "/wp-admin/css/login$suffix.css", array( 'dashicons', 'buttons', 'forms', 'l10n' ) ); - $styles->add( 'install', "/wp-admin/css/install$suffix.css", array( 'buttons' ) ); - $styles->add( 'wp-color-picker', "/wp-admin/css/color-picker$suffix.css" ); - $styles->add( 'customize-controls', "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie', 'imgareaselect' ) ); - $styles->add( 'customize-widgets', "/wp-admin/css/customize-widgets$suffix.css", array( 'wp-admin', 'colors' ) ); - $styles->add( 'customize-nav-menus', "/wp-admin/css/customize-nav-menus$suffix.css", array( 'wp-admin', 'colors' ) ); + $styles->add( 'common', "/" . WPADMIN . "/css/common$suffix.css" ); + $styles->add( 'forms', "/" . WPADMIN . "/css/forms$suffix.css" ); + $styles->add( 'admin-menu', "/" . WPADMIN . "/css/admin-menu$suffix.css" ); + $styles->add( 'dashboard', "/" . WPADMIN . "/css/dashboard$suffix.css" ); + $styles->add( 'list-tables', "/" . WPADMIN . "/css/list-tables$suffix.css" ); + $styles->add( 'edit', "/" . WPADMIN . "/css/edit$suffix.css" ); + $styles->add( 'revisions', "/" . WPADMIN . "/css/revisions$suffix.css" ); + $styles->add( 'media', "/" . WPADMIN . "/css/media$suffix.css" ); + $styles->add( 'themes', "/" . WPADMIN . "/css/themes$suffix.css" ); + $styles->add( 'about', "/" . WPADMIN . "/css/about$suffix.css" ); + $styles->add( 'nav-menus', "/" . WPADMIN . "/css/nav-menus$suffix.css" ); + $styles->add( 'widgets', "/" . WPADMIN . "/css/widgets$suffix.css", array( 'wp-pointer' ) ); + $styles->add( 'site-icon', "/" . WPADMIN . "/css/site-icon$suffix.css" ); + $styles->add( 'l10n', "/" . WPADMIN . "/css/l10n$suffix.css" ); + $styles->add( 'code-editor', "/" . WPADMIN . "/css/code-editor$suffix.css", array( 'wp-codemirror' ) ); + + $styles->add( WPADMIN, false, array( 'dashicons', 'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus', 'widgets', 'site-icon', 'l10n' ) ); + + $styles->add( 'login', "/" . WPADMIN . "/css/login$suffix.css", array( 'dashicons', 'buttons', 'forms', 'l10n' ) ); + $styles->add( 'install', "/" . WPADMIN . "/css/install$suffix.css", array( 'buttons' ) ); + $styles->add( 'wp-color-picker', "/" . WPADMIN . "/css/color-picker$suffix.css" ); + $styles->add( 'customize-controls', "/" . WPADMIN . "/css/customize-controls$suffix.css", array( WPADMIN, 'colors', 'ie', 'imgareaselect' ) ); + $styles->add( 'customize-widgets', "/" . WPADMIN . "/css/customize-widgets$suffix.css", array( WPADMIN, 'colors' ) ); + $styles->add( 'customize-nav-menus', "/" . WPADMIN . "/css/customize-nav-menus$suffix.css", array( WPADMIN, 'colors' ) ); - $styles->add( 'ie', "/wp-admin/css/ie$suffix.css" ); + $styles->add( 'ie', "/" . WPADMIN . "/css/ie$suffix.css" ); $styles->add_data( 'ie', 'conditional', 'lte IE 7' ); // Common dependencies @@ -992,10 +992,10 @@ $styles->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.css', array(), '5.29.1-alpha-ee20357' ); // Deprecated CSS - $styles->add( 'deprecated-media', "/wp-admin/css/deprecated-media$suffix.css" ); - $styles->add( 'farbtastic', "/wp-admin/css/farbtastic$suffix.css", array(), '1.3u1' ); + $styles->add( 'deprecated-media', "/" . WPADMIN . "/css/deprecated-media$suffix.css" ); + $styles->add( 'farbtastic', "/" . WPADMIN . "/css/farbtastic$suffix.css", array(), '1.3u1' ); $styles->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop.min.css", array(), '0.9.12' ); - $styles->add( 'colors-fresh', false, array( 'wp-admin', 'buttons' ) ); // Old handle. + $styles->add( 'colors-fresh', false, array( WPADMIN, 'buttons' ) ); // Old handle. $styles->add( 'open-sans', $open_sans_font_url ); // No longer used in core as of 4.6 // RTL CSS @@ -1122,7 +1122,7 @@ return; } - require_once( ABSPATH . 'wp-admin/includes/class-wp-community-events.php' ); + require_once( ABSPATH . WPADMIN . '/includes/class-wp-community-events.php' ); $user_id = get_current_user_id(); $saved_location = get_user_option( 'community-events-location', $user_id ); @@ -1200,7 +1200,7 @@ global $_wp_admin_css_colors; if ( wp_installing() ) - return preg_replace( '#^wp-admin/#', './', $src ); + return preg_replace( '#^' . WPADMIN . '/#', './', $src ); if ( 'colors' == $handle ) { $color = get_user_option('admin_color'); @@ -1333,7 +1333,7 @@ $concat = str_split( $concat, 128 ); $concat = 'load%5B%5D=' . implode( '&load%5B%5D=', $concat ); - $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&" . $concat . '&ver=' . $wp_scripts->default_version; + $src = $wp_scripts->base_url . "/" . WPADMIN . "/load-scripts.php?c={$zip}&" . $concat . '&ver=' . $wp_scripts->default_version; echo "\n"; } @@ -1501,7 +1501,7 @@ $concat = str_split( $concat, 128 ); $concat = 'load%5B%5D=' . implode( '&load%5B%5D=', $concat ); - $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&" . $concat . '&ver=' . $ver; + $href = $wp_styles->base_url . "/" . WPADMIN . "/load-styles.php?c={$zip}&dir={$dir}&" . $concat . '&ver=' . $ver; echo "\n"; if ( !empty($wp_styles->print_code) ) { Index: src/wp-includes/theme.php =================================================================== --- src/wp-includes/theme.php (revision 41634) +++ src/wp-includes/theme.php (working copy) @@ -2444,7 +2444,7 @@ add_action( 'wp_head', $args[0]['wp-head-callback'] ); if ( is_admin() ) { - require_once( ABSPATH . 'wp-admin/custom-header.php' ); + require_once( ABSPATH . WPADMIN . '/custom-header.php' ); $custom_image_header = new Custom_Image_Header( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] ); } } @@ -2457,7 +2457,7 @@ add_action( 'wp_head', $args[0]['wp-head-callback'] ); if ( is_admin() ) { - require_once( ABSPATH . 'wp-admin/custom-background.php' ); + require_once( ABSPATH . WPADMIN . '/custom-background.php' ); $custom_background = new Custom_Background( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] ); } } Index: src/wp-includes/update.php =================================================================== --- src/wp-includes/update.php (revision 41634) +++ src/wp-includes/update.php (working copy) @@ -205,7 +205,7 @@ // If running blog-side, bail unless we've not checked in the last 12 hours if ( !function_exists( 'get_plugins' ) ) - require_once( ABSPATH . 'wp-admin/includes/plugin.php' ); + require_once( ABSPATH . WPADMIN . '/includes/plugin.php' ); $plugins = get_plugins(); $translations = wp_get_installed_translations( 'plugins' ); @@ -526,8 +526,8 @@ * @since 3.7.0 */ function wp_maybe_auto_update() { - include_once( ABSPATH . '/wp-admin/includes/admin.php' ); - include_once( ABSPATH . '/wp-admin/includes/class-wp-upgrader.php' ); + include_once( ABSPATH . '/' . WPADMIN . '/includes/admin.php' ); + include_once( ABSPATH . '/' . WPADMIN . '/includes/class-wp-upgrader.php' ); $upgrader = new WP_Automatic_Updater; $upgrader->run(); Index: src/wp-load.php =================================================================== --- src/wp-load.php (revision 41634) +++ src/wp-load.php (working copy) @@ -46,6 +46,8 @@ // A config file doesn't exist define( 'WPINC', 'wp-includes' ); + define( 'WPADMIN', 'wp-admin' ); + require_once( ABSPATH . WPINC . '/load.php' ); // Standardize $_SERVER variables across setups. @@ -53,7 +55,7 @@ require_once( ABSPATH . WPINC . '/functions.php' ); - $path = wp_guess_url() . '/wp-admin/setup-config.php'; + $path = wp_guess_url() . '/' . WPADMIN . '/setup-config.php'; /* * We're going to redirect to setup-config.php. While this shouldn't result Index: src/wp-login.php =================================================================== --- src/wp-login.php (revision 41634) +++ src/wp-login.php (working copy) @@ -804,7 +804,7 @@ if ( isset( $_REQUEST['redirect_to'] ) ) { $redirect_to = $_REQUEST['redirect_to']; // Redirect to https if user wants ssl - if ( $secure_cookie && false !== strpos($redirect_to, 'wp-admin') ) + if ( $secure_cookie && false !== strpos($redirect_to, WPADMIN) ) $redirect_to = preg_replace('|^http://|', 'https://', $redirect_to); } else { $redirect_to = admin_url(); @@ -855,7 +855,7 @@ ID) && !is_super_admin( $user->ID ) ) $redirect_to = user_admin_url(); Index: src/wp-settings.php =================================================================== --- src/wp-settings.php (revision 41634) +++ src/wp-settings.php (working copy) @@ -14,6 +14,7 @@ * @since 1.0.0 */ define( 'WPINC', 'wp-includes' ); +define( 'WPADMIN', 'wp-admin' ); // Include files required for initialization. require( ABSPATH . WPINC . '/load.php' ); Index: src/xmlrpc.php =================================================================== --- src/xmlrpc.php (revision 41634) +++ src/xmlrpc.php (working copy) @@ -59,7 +59,7 @@ exit; } -include_once(ABSPATH . 'wp-admin/includes/admin.php'); +include_once(ABSPATH . WPADMIN . '/includes/admin.php'); include_once(ABSPATH . WPINC . '/class-IXR.php'); include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');