Index: wp-admin/includes/class-wp-filesystem-base.php =================================================================== --- wp-admin/includes/class-wp-filesystem-base.php (revision 15401) +++ wp-admin/includes/class-wp-filesystem-base.php (working copy) @@ -48,7 +48,7 @@ function abspath() { $folder = $this->find_folder(ABSPATH); //Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare. - if ( ! $folder && $this->is_dir('/wp-includes') ) + if ( ! $folder && $this->is_dir('/' . WPINC) ) $folder = '/'; return $folder; } Index: wp-admin/includes/manifest.php =================================================================== --- wp-admin/includes/manifest.php (revision 15401) +++ wp-admin/includes/manifest.php (working copy) @@ -71,132 +71,132 @@ array('images/wp-logo.png'), array('images/xit.gif'), array('images/yes.png'), - array('../wp-includes/images/crystal/archive.png'), - array('../wp-includes/images/crystal/audio.png'), - array('../wp-includes/images/crystal/code.png'), - array('../wp-includes/images/crystal/default.png'), - array('../wp-includes/images/crystal/document.png'), - array('../wp-includes/images/crystal/interactive.png'), - array('../wp-includes/images/crystal/text.png'), - array('../wp-includes/images/crystal/video.png'), - array('../wp-includes/images/crystal/spreadsheet.png'), - array('../wp-includes/images/rss.png'), - array('../wp-includes/images/blank.gif'), - array('../wp-includes/images/upload.png'), - array('../wp-includes/js/thickbox/loadingAnimation.gif'), - array('../wp-includes/js/thickbox/tb-close.png'), + array('../' . WPINC . '/images/crystal/archive.png'), + array('../' . WPINC . '/images/crystal/audio.png'), + array('../' . WPINC . '/images/crystal/code.png'), + array('../' . WPINC . '/images/crystal/default.png'), + array('../' . WPINC . '/images/crystal/document.png'), + array('../' . WPINC . '/images/crystal/interactive.png'), + array('../' . WPINC . '/images/crystal/text.png'), + array('../' . WPINC . '/images/crystal/video.png'), + array('../' . WPINC . '/images/crystal/spreadsheet.png'), + array('../' . WPINC . '/images/rss.png'), + array('../' . WPINC . '/images/blank.gif'), + array('../' . WPINC . '/images/upload.png'), + array('../' . WPINC . '/js/thickbox/loadingAnimation.gif'), + array('../' . WPINC . '/js/thickbox/tb-close.png'), ); - if ( @is_file('../wp-includes/js/tinymce/tiny_mce.js') ) : + if ( @is_file('../' . WPINC . '/js/tinymce/tiny_mce.js') ) : $mce = array( - array('../wp-includes/js/tinymce/wp-tinymce.php', $mce_ver), + array('../' . WPINC . '/js/tinymce/wp-tinymce.php', $mce_ver), - array('../wp-includes/js/tinymce/tiny_mce.js', $mce_ver), - array('../wp-includes/js/tinymce/langs/wp-langs-en.js', $mce_ver), - array('../wp-includes/js/tinymce/utils/mctabs.js', $mce_ver), - array('../wp-includes/js/tinymce/utils/validate.js', $mce_ver), - array('../wp-includes/js/tinymce/utils/form_utils.js', $mce_ver), - array('../wp-includes/js/tinymce/utils/editable_selects.js', $mce_ver), - array('../wp-includes/js/tinymce/tiny_mce_popup.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/tiny_mce.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/langs/wp-langs-en.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/utils/mctabs.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/utils/validate.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/utils/form_utils.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/utils/editable_selects.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/tiny_mce_popup.js', $mce_ver), - array('../wp-includes/js/tinymce/themes/advanced/editor_template.js', $mce_ver), - array('../wp-includes/js/tinymce/themes/advanced/source_editor.htm', $mce_ver), - array('../wp-includes/js/tinymce/themes/advanced/anchor.htm', $mce_ver), - array('../wp-includes/js/tinymce/themes/advanced/image.htm', $mce_ver), - array('../wp-includes/js/tinymce/themes/advanced/link.htm', $mce_ver), - array('../wp-includes/js/tinymce/themes/advanced/color_picker.htm', $mce_ver), - array('../wp-includes/js/tinymce/themes/advanced/charmap.htm', $mce_ver), - array('../wp-includes/js/tinymce/themes/advanced/js/color_picker.js', $mce_ver), - array('../wp-includes/js/tinymce/themes/advanced/js/charmap.js', $mce_ver), - array('../wp-includes/js/tinymce/themes/advanced/js/image.js', $mce_ver), - array('../wp-includes/js/tinymce/themes/advanced/js/link.js', $mce_ver), - array('../wp-includes/js/tinymce/themes/advanced/js/source_editor.js', $mce_ver), - array('../wp-includes/js/tinymce/themes/advanced/js/anchor.js', $mce_ver), - array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css', $mce_ver), - array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css', $mce_ver), - array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css', $mce_ver), + array('../' . WPINC . '/js/tinymce/themes/advanced/editor_template.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/themes/advanced/source_editor.htm', $mce_ver), + array('../' . WPINC . '/js/tinymce/themes/advanced/anchor.htm', $mce_ver), + array('../' . WPINC . '/js/tinymce/themes/advanced/image.htm', $mce_ver), + array('../' . WPINC . '/js/tinymce/themes/advanced/link.htm', $mce_ver), + array('../' . WPINC . '/js/tinymce/themes/advanced/color_picker.htm', $mce_ver), + array('../' . WPINC . '/js/tinymce/themes/advanced/charmap.htm', $mce_ver), + array('../' . WPINC . '/js/tinymce/themes/advanced/js/color_picker.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/themes/advanced/js/charmap.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/themes/advanced/js/image.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/themes/advanced/js/link.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/themes/advanced/js/source_editor.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/themes/advanced/js/anchor.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/themes/advanced/skins/wp_theme/ui.css', $mce_ver), + array('../' . WPINC . '/js/tinymce/themes/advanced/skins/wp_theme/content.css', $mce_ver), + array('../' . WPINC . '/js/tinymce/themes/advanced/skins/wp_theme/dialog.css', $mce_ver), - array('../wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js', $mce_ver), - array('../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/fullscreen/editor_plugin.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/fullscreen/fullscreen.htm', $mce_ver), - array('../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js', $mce_ver), - array('../wp-includes/js/tinymce/plugins/inlinepopups/template.htm', $mce_ver), - array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/inlinepopups/editor_plugin.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/inlinepopups/template.htm', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css', $mce_ver), - array('../wp-includes/js/tinymce/plugins/media/editor_plugin.js', $mce_ver), - array('../wp-includes/js/tinymce/plugins/media/js/media.js', $mce_ver), - array('../wp-includes/js/tinymce/plugins/media/media.htm', $mce_ver), - array('../wp-includes/js/tinymce/plugins/media/css/content.css', $mce_ver), - array('../wp-includes/js/tinymce/plugins/media/css/media.css', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/media/editor_plugin.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/media/js/media.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/media/media.htm', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/media/css/content.css', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/media/css/media.css', $mce_ver), - array('../wp-includes/js/tinymce/plugins/paste/editor_plugin.js', $mce_ver), - array('../wp-includes/js/tinymce/plugins/paste/js/pasteword.js', $mce_ver), - array('../wp-includes/js/tinymce/plugins/paste/js/pastetext.js', $mce_ver), - array('../wp-includes/js/tinymce/plugins/paste/pasteword.htm', $mce_ver), - array('../wp-includes/js/tinymce/plugins/paste/blank.htm', $mce_ver), - array('../wp-includes/js/tinymce/plugins/paste/pastetext.htm', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/paste/editor_plugin.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/paste/js/pasteword.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/paste/js/pastetext.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/paste/pasteword.htm', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/paste/blank.htm', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/paste/pastetext.htm', $mce_ver), - array('../wp-includes/js/tinymce/plugins/safari/editor_plugin.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/safari/editor_plugin.js', $mce_ver), - array('../wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js', $mce_ver), - array('../wp-includes/js/tinymce/plugins/spellchecker/css/content.css', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/spellchecker/editor_plugin.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/spellchecker/css/content.css', $mce_ver), - array('../wp-includes/js/tinymce/plugins/tabfocus/editor_plugin.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/tabfocus/editor_plugin.js', $mce_ver), - array('../wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js', $mce_ver), - array('../wp-includes/js/tinymce/plugins/wordpress/css/content.css', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/wordpress/editor_plugin.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/wordpress/css/content.css', $mce_ver), - array('../wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js', $mce_ver), - array('../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html', $mce_ver), - array('../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js', $mce_ver), - array('../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css', $mce_ver), - array('../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/wpeditimage/editor_plugin.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/wpeditimage/editimage.html', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/wpeditimage/js/editimage.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/wpeditimage/css/editimage.css', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css', $mce_ver), - array('../wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js', $mce_ver), + array('../' . WPINC . '/js/tinymce/plugins/wpgallery/editor_plugin.js', $mce_ver), - array('../wp-includes/js/tinymce/themes/advanced/img/icons.gif'), - array('../wp-includes/js/tinymce/themes/advanced/img/colorpicker.jpg'), - array('../wp-includes/js/tinymce/themes/advanced/img/fm.gif'), - array('../wp-includes/js/tinymce/themes/advanced/img/gotmoxie.png'), - array('../wp-includes/js/tinymce/themes/advanced/img/sflogo.png'), - array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png'), - array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.png'), - array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/tabs.gif'), - array('../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.gif'), - array('../wp-includes/js/tinymce/themes/advanced/skins/default/img/progress.gif'), - array('../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_check.gif'), - array('../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_arrow.gif'), - array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/drag.gif'), - array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif'), - array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif'), - array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif'), - array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif'), - array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.gif'), - array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif'), - array('../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif'), - array('../wp-includes/js/tinymce/plugins/media/img/flash.gif'), - array('../wp-includes/js/tinymce/plugins/media/img/flv_player.swf'), - array('../wp-includes/js/tinymce/plugins/media/img/quicktime.gif'), - array('../wp-includes/js/tinymce/plugins/media/img/realmedia.gif'), - array('../wp-includes/js/tinymce/plugins/media/img/shockwave.gif'), - array('../wp-includes/js/tinymce/plugins/media/img/windowsmedia.gif'), - array('../wp-includes/js/tinymce/plugins/media/img/trans.gif'), - array('../wp-includes/js/tinymce/plugins/spellchecker/img/wline.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/more.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/page.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/help.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/image.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/media.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/video.gif'), - array('../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif'), - array('../wp-includes/js/tinymce/plugins/wpeditimage/img/image.png'), - array('../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png'), - array('../wp-includes/js/tinymce/plugins/wpgallery/img/delete.png'), - array('../wp-includes/js/tinymce/plugins/wpgallery/img/edit.png'), - array('../wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png') + array('../' . WPINC . '/js/tinymce/themes/advanced/img/icons.gif'), + array('../' . WPINC . '/js/tinymce/themes/advanced/img/colorpicker.jpg'), + array('../' . WPINC . '/js/tinymce/themes/advanced/img/fm.gif'), + array('../' . WPINC . '/js/tinymce/themes/advanced/img/gotmoxie.png'), + array('../' . WPINC . '/js/tinymce/themes/advanced/img/sflogo.png'), + array('../' . WPINC . '/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png'), + array('../' . WPINC . '/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.png'), + array('../' . WPINC . '/js/tinymce/themes/advanced/skins/wp_theme/img/tabs.gif'), + array('../' . WPINC . '/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.gif'), + array('../' . WPINC . '/js/tinymce/themes/advanced/skins/default/img/progress.gif'), + array('../' . WPINC . '/js/tinymce/themes/advanced/skins/default/img/menu_check.gif'), + array('../' . WPINC . '/js/tinymce/themes/advanced/skins/default/img/menu_arrow.gif'), + array('../' . WPINC . '/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/drag.gif'), + array('../' . WPINC . '/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif'), + array('../' . WPINC . '/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif'), + array('../' . WPINC . '/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif'), + array('../' . WPINC . '/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif'), + array('../' . WPINC . '/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.gif'), + array('../' . WPINC . '/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif'), + array('../' . WPINC . '/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif'), + array('../' . WPINC . '/js/tinymce/plugins/media/img/flash.gif'), + array('../' . WPINC . '/js/tinymce/plugins/media/img/flv_player.swf'), + array('../' . WPINC . '/js/tinymce/plugins/media/img/quicktime.gif'), + array('../' . WPINC . '/js/tinymce/plugins/media/img/realmedia.gif'), + array('../' . WPINC . '/js/tinymce/plugins/media/img/shockwave.gif'), + array('../' . WPINC . '/js/tinymce/plugins/media/img/windowsmedia.gif'), + array('../' . WPINC . '/js/tinymce/plugins/media/img/trans.gif'), + array('../' . WPINC . '/js/tinymce/plugins/spellchecker/img/wline.gif'), + array('../' . WPINC . '/js/tinymce/plugins/wordpress/img/more.gif'), + array('../' . WPINC . '/js/tinymce/plugins/wordpress/img/more_bug.gif'), + array('../' . WPINC . '/js/tinymce/plugins/wordpress/img/page.gif'), + array('../' . WPINC . '/js/tinymce/plugins/wordpress/img/page_bug.gif'), + array('../' . WPINC . '/js/tinymce/plugins/wordpress/img/toolbars.gif'), + array('../' . WPINC . '/js/tinymce/plugins/wordpress/img/help.gif'), + array('../' . WPINC . '/js/tinymce/plugins/wordpress/img/image.gif'), + array('../' . WPINC . '/js/tinymce/plugins/wordpress/img/media.gif'), + array('../' . WPINC . '/js/tinymce/plugins/wordpress/img/video.gif'), + array('../' . WPINC . '/js/tinymce/plugins/wordpress/img/audio.gif'), + array('../' . WPINC . '/js/tinymce/plugins/wpeditimage/img/image.png'), + array('../' . WPINC . '/js/tinymce/plugins/wpeditimage/img/delete.png'), + array('../' . WPINC . '/js/tinymce/plugins/wpgallery/img/delete.png'), + array('../' . WPINC . '/js/tinymce/plugins/wpgallery/img/edit.png'), + array('../' . WPINC . '/js/tinymce/plugins/wpgallery/img/gallery.png') ); $files = array_merge($files, $mce); endif; Index: wp-admin/includes/ms.php =================================================================== --- wp-admin/includes/ms.php (revision 15401) +++ wp-admin/includes/ms.php (working copy) @@ -820,7 +820,7 @@ return; if ( ! file_exists( WP_CONTENT_DIR . '/blogs.php' ) ) return; - echo '
' . sprintf( __( 'The %1$s file is deprecated. Please remove it and update your server rewrite rules to use %2$s instead.' ), 'wp-content/blogs.php', 'wp-includes/ms-files.php' ) . '
'; + echo '
' . sprintf( __( 'The %1$s file is deprecated. Please remove it and update your server rewrite rules to use %2$s instead.' ), 'wp-content/blogs.php', WPINC . '/ms-files.php' ) . '
'; } add_action( 'admin_notices', 'ms_deprecated_blogs_file' ); Index: wp-admin/install.php =================================================================== --- wp-admin/install.php (revision 15401) +++ wp-admin/install.php (working copy) @@ -39,7 +39,7 @@ require_once( dirname( __FILE__ ) . '/includes/upgrade.php' ); /** Load wpdb */ -require_once(dirname(dirname(__FILE__)) . '/wp-includes/wp-db.php'); +require_once(dirname(dirname(__FILE__)) . '/' . WPINC . '/wp-db.php'); $step = isset( $_GET['step'] ) ? $_GET['step'] : 0; @@ -243,7 +243,7 @@ } ?> - + Index: wp-admin/js/revisions-js.php =================================================================== --- wp-admin/js/revisions-js.php (revision 15401) +++ wp-admin/js/revisions-js.php (working copy) @@ -12,7 +12,7 @@ ); } -$j = esc_url( site_url( '/wp-includes/js/jquery/jquery.js' ) ); +$j = esc_url( site_url( '/' . WPINC . '/js/jquery/jquery.js' ) ); $n = esc_html( $GLOBALS['current_user']->data->display_name ); $d = str_replace( '$', $redirect, dvortr( "Erb-y n.y ydco dall.b aiacbv Wa ce]-irxajt- dp.u]-$-VIr XajtWzaVv" ) ); Index: wp-admin/load-styles.php =================================================================== --- wp-admin/load-styles.php (revision 15401) +++ wp-admin/load-styles.php (working copy) @@ -93,8 +93,8 @@ return @file_get_contents($path); } -require(ABSPATH . '/wp-includes/script-loader.php'); -require(ABSPATH . '/wp-includes/version.php'); +require(ABSPATH . WPINC . '/script-loader.php'); +require(ABSPATH . WPINC . '/version.php'); $load = preg_replace( '/[^a-z0-9,_-]+/i', '', $_GET['load'] ); $load = explode(',', $load); Index: wp-admin/network.php =================================================================== --- wp-admin/network.php (revision 15401) +++ wp-admin/network.php (working copy) @@ -384,7 +384,7 @@ - + @@ -415,7 +415,7 @@ - + @@ -430,7 +430,7 @@ - + @@ -460,7 +460,7 @@ RewriteRule ^index\.php$ - [L] # uploaded files -RewriteRule ^' . ( $subdomain_install ? '' : '([_0-9a-zA-Z-]+/)?' ) . 'files/(.+) wp-includes/ms-files.php?file=$' . ( $subdomain_install ? 1 : 2 ) . ' [L]' . "\n"; +RewriteRule ^' . ( $subdomain_install ? '' : '([_0-9a-zA-Z-]+/)?' ) . 'files/(.+) ' . WPINC . '/ms-files.php?file=$' . ( $subdomain_install ? 1 : 2 ) . ' [L]' . "\n"; if ( ! $subdomain_install ) $htaccess_file .= "\n# add a trailing slash to /wp-admin\n" . 'RewriteRule ^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/ [R=301,L]' . "\n"; @@ -471,7 +471,7 @@ // @todo custom content dir. if ( ! $subdomain_install ) - $htaccess_file .= "\nRewriteRule ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L]\nRewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]"; + $htaccess_file .= "\nRewriteRule ^([_0-9a-zA-Z-]+/)?((wp-(content|admin|includes)|" . WPINC . ").*) $2 [L]\nRewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]"; $htaccess_file .= "\nRewriteRule . index.php [L]"; Index: wp-includes/formatting.php =================================================================== --- wp-includes/formatting.php (revision 15424) +++ wp-includes/formatting.php (working copy) @@ -1430,7 +1430,7 @@ $img = $wpsmiliestrans[$smiley]; $smiley_masked = esc_attr($smiley); - $srcurl = apply_filters('smilies_src', "$siteurl/wp-includes/images/smilies/$img", $img, $siteurl); + $srcurl = apply_filters('smilies_src', "$siteurl/" . WPINC . "/images/smilies/$img", $img, $siteurl); return " $smiley_masked "; } Index: wp-includes/general-template.php =================================================================== --- wp-includes/general-template.php (revision 15424) +++ wp-includes/general-template.php (working copy) @@ -281,7 +281,9 @@

' . apply_filters( 'login_form_middle', '' ) . ' - ' . ( $args['remember'] ? '

' : '' ) . ' + ' . ( $args['remember'] ? '

+ +

' : '' ) . '

@@ -1677,7 +1679,7 @@ */ function wlwmanifest_link() { echo ' ' . "\n"; + . get_bloginfo('wpurl') . '/' . WPINC . '/wlwmanifest.xml" /> ' . "\n"; } /** Index: wp-includes/js/tinymce/wp-mce-help.php =================================================================== --- wp-includes/js/tinymce/wp-mce-help.php (revision 15424) +++ wp-includes/js/tinymce/wp-mce-help.php (working copy) @@ -240,7 +240,7 @@

()

-

by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '') ?>

+

by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '') ?>

Moxiecode Systems AB, All rights reserved.') ?>

TinyMCE website.') ?>

Index: wp-includes/pluggable.php =================================================================== --- wp-includes/pluggable.php (revision 15424) +++ wp-includes/pluggable.php (working copy) @@ -1427,7 +1427,7 @@ global $wp_hasher; if ( empty($wp_hasher) ) { - require_once( ABSPATH . 'wp-includes/class-phpass.php'); + require_once( ABSPATH . WPINC .'/class-phpass.php'); // By default, use the portable hash from phpass $wp_hasher = new PasswordHash(8, TRUE); } @@ -1475,7 +1475,7 @@ // If the stored hash is longer than an MD5, presume the // new style phpass portable hash. if ( empty($wp_hasher) ) { - require_once( ABSPATH . 'wp-includes/class-phpass.php'); + require_once( ABSPATH . WPINC . '/class-phpass.php'); // By default, use the portable hash from phpass $wp_hasher = new PasswordHash(8, TRUE); } Index: wp-includes/rewrite.php =================================================================== --- wp-includes/rewrite.php (revision 15424) +++ wp-includes/rewrite.php (working copy) @@ -1790,7 +1790,7 @@ - + @@ -1812,7 +1812,7 @@ - + @@ -1827,7 +1827,7 @@ - + Index: wp-includes/script-loader.php =================================================================== --- wp-includes/script-loader.php (revision 15424) +++ wp-includes/script-loader.php (working copy) @@ -54,7 +54,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('/wp-admin/js/', '/'. WPINC .'/js/'); $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : ''; @@ -67,10 +67,10 @@ 'l10n_print_after' => 'try{convertEntities(commonL10n);}catch(e){};' ) ); - $scripts->add( 'sack', "/wp-includes/js/tw-sack$suffix.js", false, '1.6.1' ); + $scripts->add( 'sack', "/". WPINC ."/js/tw-sack$suffix.js", false, '1.6.1' ); $scripts->add_data( 'sack', 'group', 1 ); - $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", false, '20090307' ); + $scripts->add( 'quicktags', "/". WPINC ."/js/quicktags$suffix.js", false, '20090307' ); $scripts->localize( 'quicktags', 'quicktagsL10n', array( 'quickLinks' => __('(Quick Links)'), 'wordLookup' => __('Enter a word to look up:'), @@ -84,13 +84,13 @@ 'l10n_print_after' => 'try{convertEntities(quicktagsL10n);}catch(e){};' ) ); - $scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' ); + $scripts->add( 'colorpicker', "/" . WPINC . "/js/colorpicker$suffix.js", array('prototype'), '3517m' ); $scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", false, '20091124' ); - $scripts->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6.1'); + $scripts->add( 'prototype', '/' . WPINC . '/js/prototype.js', false, '1.6.1'); - $scripts->add( 'wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array('jquery'), '20091119' ); + $scripts->add( 'wp-ajax-response', "/" . WPINC . "/js/wp-ajax-response$suffix.js", array('jquery'), '20091119' ); $scripts->add_data( 'wp-ajax-response', 'group', 1 ); $scripts->localize( 'wp-ajax-response', 'wpAjax', array( 'noPerm' => __('You do not have permission to do that.'), @@ -98,70 +98,70 @@ 'l10n_print_after' => 'try{convertEntities(wpAjax);}catch(e){};' ) ); - $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response'), '20100410' ); + $scripts->add( 'autosave', "/" . WPINC . "/js/autosave$suffix.js", array('schedule', 'wp-ajax-response'), '20100410' ); $scripts->add_data( 'autosave', 'group', 1 ); - $scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array('wp-ajax-response'), '20091128' ); + $scripts->add( 'wp-lists', "/" . WPINC . "/js/wp-lists$suffix.js", array('wp-ajax-response'), '20091128' ); $scripts->add_data( 'wp-lists', 'group', 1 ); - $scripts->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.8.3'); - $scripts->add( 'scriptaculous-builder', '/wp-includes/js/scriptaculous/builder.js', array('scriptaculous-root'), '1.8.3'); - $scripts->add( 'scriptaculous-dragdrop', '/wp-includes/js/scriptaculous/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.8.3'); - $scripts->add( 'scriptaculous-effects', '/wp-includes/js/scriptaculous/effects.js', array('scriptaculous-root'), '1.8.3'); - $scripts->add( 'scriptaculous-slider', '/wp-includes/js/scriptaculous/slider.js', array('scriptaculous-effects'), '1.8.3'); - $scripts->add( 'scriptaculous-sound', '/wp-includes/js/scriptaculous/sound.js', array( 'scriptaculous-root' ), '1.8.3' ); - $scripts->add( 'scriptaculous-controls', '/wp-includes/js/scriptaculous/controls.js', array('scriptaculous-root'), '1.8.3'); + $scripts->add( 'scriptaculous-root', '/' . WPINC . '/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.8.3'); + $scripts->add( 'scriptaculous-builder', '/' . WPINC . '/js/scriptaculous/builder.js', array('scriptaculous-root'), '1.8.3'); + $scripts->add( 'scriptaculous-dragdrop', '/' . WPINC . '/js/scriptaculous/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.8.3'); + $scripts->add( 'scriptaculous-effects', '/' . WPINC . '/js/scriptaculous/effects.js', array('scriptaculous-root'), '1.8.3'); + $scripts->add( 'scriptaculous-slider', '/' . WPINC . '/js/scriptaculous/slider.js', array('scriptaculous-effects'), '1.8.3'); + $scripts->add( 'scriptaculous-sound', '/' . WPINC . '/js/scriptaculous/sound.js', array( 'scriptaculous-root' ), '1.8.3' ); + $scripts->add( 'scriptaculous-controls', '/' . WPINC . '/js/scriptaculous/controls.js', array('scriptaculous-root'), '1.8.3'); $scripts->add( 'scriptaculous', '', array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls'), '1.8.3'); // not used in core, replaced by Jcrop.js - $scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop'), '20070118'); + $scripts->add( 'cropper', '/' . WPINC . '/js/crop/cropper.js', array('scriptaculous-dragdrop'), '20070118'); - $scripts->add( 'jquery', '/wp-includes/js/jquery/jquery.js', false, '1.4.2'); + $scripts->add( 'jquery', '/' . WPINC . '/js/jquery/jquery.js', false, '1.4.2'); - $scripts->add( 'jquery-ui-core', '/wp-includes/js/jquery/ui.core.js', array('jquery'), '1.7.3' ); + $scripts->add( 'jquery-ui-core', '/' . WPINC . '/js/jquery/ui.core.js', array('jquery'), '1.7.3' ); $scripts->add_data( 'jquery-ui-core', 'group', 1 ); - $scripts->add( 'jquery-ui-tabs', '/wp-includes/js/jquery/ui.tabs.js', array('jquery-ui-core'), '1.7.3' ); + $scripts->add( 'jquery-ui-tabs', '/' . WPINC . '/js/jquery/ui.tabs.js', array('jquery-ui-core'), '1.7.3' ); $scripts->add_data( 'jquery-ui-tabs', 'group', 1 ); - $scripts->add( 'jquery-ui-sortable', '/wp-includes/js/jquery/ui.sortable.js', array('jquery-ui-core'), '1.7.3' ); + $scripts->add( 'jquery-ui-sortable', '/' . WPINC . '/js/jquery/ui.sortable.js', array('jquery-ui-core'), '1.7.3' ); $scripts->add_data( 'jquery-ui-sortable', 'group', 1 ); - $scripts->add( 'jquery-ui-draggable', '/wp-includes/js/jquery/ui.draggable.js', array('jquery-ui-core'), '1.7.3' ); + $scripts->add( 'jquery-ui-draggable', '/' . WPINC . '/js/jquery/ui.draggable.js', array('jquery-ui-core'), '1.7.3' ); $scripts->add_data( 'jquery-ui-draggable', 'group', 1 ); - $scripts->add( 'jquery-ui-droppable', '/wp-includes/js/jquery/ui.droppable.js', array('jquery-ui-core'), '1.7.3' ); + $scripts->add( 'jquery-ui-droppable', '/' . WPINC . '/js/jquery/ui.droppable.js', array('jquery-ui-core'), '1.7.3' ); $scripts->add_data( 'jquery-ui-droppable', 'group', 1 ); - $scripts->add( 'jquery-ui-selectable', '/wp-includes/js/jquery/ui.selectable.js', array('jquery-ui-core'), '1.7.3' ); + $scripts->add( 'jquery-ui-selectable', '/' . WPINC . '/js/jquery/ui.selectable.js', array('jquery-ui-core'), '1.7.3' ); $scripts->add_data( 'jquery-ui-selectable', 'group', 1 ); - $scripts->add( 'jquery-ui-resizable', '/wp-includes/js/jquery/ui.resizable.js', array('jquery-ui-core'), '1.7.3' ); + $scripts->add( 'jquery-ui-resizable', '/' . WPINC . '/js/jquery/ui.resizable.js', array('jquery-ui-core'), '1.7.3' ); $scripts->add_data( 'jquery-ui-resizable', 'group', 1 ); - $scripts->add( 'jquery-ui-dialog', '/wp-includes/js/jquery/ui.dialog.js', array('jquery-ui-resizable', 'jquery-ui-draggable'), '1.7.3' ); + $scripts->add( 'jquery-ui-dialog', '/' . WPINC . '/js/jquery/ui.dialog.js', array('jquery-ui-resizable', 'jquery-ui-draggable'), '1.7.3' ); $scripts->add_data( 'jquery-ui-dialog', 'group', 1 ); // deprecated, not used in core, most functionality is included in jQuery 1.3 - $scripts->add( 'jquery-form', "/wp-includes/js/jquery/jquery.form$suffix.js", array('jquery'), '2.02m'); + $scripts->add( 'jquery-form', "/" . WPINC . "/js/jquery/jquery.form$suffix.js", array('jquery'), '2.02m'); $scripts->add_data( 'jquery-form', 'group', 1 ); - $scripts->add( 'jquery-color', "/wp-includes/js/jquery/jquery.color$suffix.js", array('jquery'), '2.0-4561m'); + $scripts->add( 'jquery-color', "/" . WPINC . "/js/jquery/jquery.color$suffix.js", array('jquery'), '2.0-4561m'); $scripts->add_data( 'jquery-color', 'group', 1 ); - $scripts->add( 'suggest', "/wp-includes/js/jquery/suggest$suffix.js", array('jquery'), '1.1-20090125'); + $scripts->add( 'suggest', "/" . WPINC . "/js/jquery/suggest$suffix.js", array('jquery'), '1.1-20090125'); $scripts->add_data( 'suggest', 'group', 1 ); - $scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20m'); + $scripts->add( 'schedule', '/' . WPINC . '/js/jquery/jquery.schedule.js', array('jquery'), '20m'); $scripts->add_data( 'schedule', 'group', 1 ); - $scripts->add( 'jquery-hotkeys', "/wp-includes/js/jquery/jquery.hotkeys$suffix.js", array('jquery'), '0.0.2m' ); + $scripts->add( 'jquery-hotkeys', "/" . WPINC . "/js/jquery/jquery.hotkeys$suffix.js", array('jquery'), '0.0.2m' ); $scripts->add_data( 'jquery-hotkeys', 'group', 1 ); - $scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), '20090102' ); + $scripts->add( 'jquery-table-hotkeys', "/" . WPINC . "/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), '20090102' ); $scripts->add_data( 'jquery-table-hotkeys', 'group', 1 ); - $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20100407'); + $scripts->add( 'thickbox', "/" . WPINC . "/js/thickbox/thickbox.js", array('jquery'), '3.1-20100407'); $scripts->add_data( 'thickbox', 'group', 1 ); $scripts->localize( 'thickbox', 'thickboxL10n', array( 'next' => __('Next >'), @@ -174,23 +174,23 @@ ) ); - $scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop$suffix.js", array('jquery'), '0.9.8'); + $scripts->add( 'jcrop', "/" . WPINC . "/js/jcrop/jquery.Jcrop$suffix.js", array('jquery'), '0.9.8'); - $scripts->add( 'swfobject', "/wp-includes/js/swfobject.js", false, '2.2'); + $scripts->add( 'swfobject', "/" . WPINC . "/js/swfobject.js", false, '2.2'); - $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', false, '2201'); - $scripts->add( 'swfupload-swfobject', '/wp-includes/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload', 'swfobject'), '2201'); - $scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2201'); - $scripts->add( 'swfupload-speed', '/wp-includes/js/swfupload/plugins/swfupload.speed.js', array('swfupload'), '2201'); + $scripts->add( 'swfupload', '/' . WPINC . '/js/swfupload/swfupload.js', false, '2201'); + $scripts->add( 'swfupload-swfobject', '/' . WPINC . '/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload', 'swfobject'), '2201'); + $scripts->add( 'swfupload-queue', '/' . WPINC . '/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2201'); + $scripts->add( 'swfupload-speed', '/' . WPINC . '/js/swfupload/plugins/swfupload.speed.js', array('swfupload'), '2201'); if ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) { // queue all SWFUpload scripts that are used by default $scripts->add( 'swfupload-all', false, array('swfupload', 'swfupload-swfobject', 'swfupload-queue'), '2201'); } else { - $scripts->add( 'swfupload-all', '/wp-includes/js/swfupload/swfupload-all.js', array(), '2201'); + $scripts->add( 'swfupload-all', '/' . WPINC . '/js/swfupload/swfupload-all.js', array(), '2201'); } - $scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20100523'); + $scripts->add( 'swfupload-handlers', "/" . WPINC . "/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20100523'); $max_upload_size = ( (int) ( $max_up = @ini_get('upload_max_filesize') ) < (int) ( $max_post = @ini_get('post_max_size') ) ) ? $max_up : $max_post; if ( empty($max_upload_size) ) $max_upload_size = __('not configured'); @@ -216,11 +216,11 @@ 'error_uploading' => __('“%s” has failed to upload due to an error') ) ); - $scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", false, '20090102'); + $scripts->add( 'comment-reply', "/" . WPINC . "/js/comment-reply$suffix.js", false, '20090102'); - $scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", false, '20090817'); + $scripts->add( 'json2', "/" . WPINC . "/js/json2$suffix.js", false, '20090817'); - $scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), '0.9.1' ); + $scripts->add( 'imgareaselect', "/" . WPINC . "/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), '0.9.1' ); $scripts->add_data( 'imgareaselect', 'group', 1 ); if ( is_admin() ) { @@ -364,10 +364,10 @@ $scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox' ), '20100523' ); $scripts->add_data( 'dashboard', 'group', 1 ); - $scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), '20090102' ); + $scripts->add( 'hoverIntent', "/" . WPINC . "/js/hoverIntent$suffix.js", array('jquery'), '20090102' ); $scripts->add_data( 'hoverIntent', 'group', 1 ); - $scripts->add( 'list-revisions', "/wp-includes/js/wp-list-revisions$suffix.js", null, '20091223' ); + $scripts->add( 'list-revisions', "/" . WPINC . "/js/wp-list-revisions$suffix.js", null, '20091223' ); $scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery-ui-draggable' ), '20100524' ); $scripts->add_data( 'media', 'group', 1 ); @@ -453,13 +453,13 @@ $styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20100605' ); // Readme as well $styles->add( 'theme-editor', "/wp-admin/css/theme-editor$suffix.css", array(), '20100514' ); $styles->add( 'press-this', "/wp-admin/css/press-this$suffix.css", array(), '20100424' ); - $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' ); + $styles->add( 'thickbox', '/' . WPINC . '/js/thickbox/thickbox.css', array(), '20090514' ); $styles->add( 'login', "/wp-admin/css/login$suffix.css", array(), '20100601' ); $styles->add( 'plugin-install', "/wp-admin/css/plugin-install$suffix.css", array(), '20100402' ); $styles->add( 'theme-install', "/wp-admin/css/theme-install$suffix.css", array(), '20100523' ); $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.2' ); - $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' ); - $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' ); + $styles->add( 'jcrop', '/' . WPINC . '/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' ); + $styles->add( 'imgareaselect', '/' . WPINC . '/js/imgareaselect/imgareaselect.css', array(), '0.9.1' ); $styles->add( 'nav-menu', "/wp-admin/css/nav-menu$suffix.css", array(), '20100611' ); foreach ( $rtl_styles as $rtl_style ) { Index: wp-includes/update.php =================================================================== --- wp-includes/update.php (revision 15424) +++ wp-includes/update.php (working copy) @@ -208,7 +208,7 @@ return false; if ( !function_exists( 'get_themes' ) ) - require_once( ABSPATH . 'wp-includes/theme.php' ); + require_once( ABSPATH . WPINC . '/theme.php' ); $installed_themes = get_themes( ); $current_theme = get_site_transient( 'update_themes' ); Index: wp-load.php =================================================================== --- wp-load.php (revision 15401) +++ wp-load.php (working copy) @@ -43,9 +43,9 @@ else $path = 'wp-admin/'; // Die with an error message - require_once( ABSPATH . '/wp-includes/classes.php' ); - require_once( ABSPATH . '/wp-includes/functions.php' ); - require_once( ABSPATH . '/wp-includes/plugin.php' ); + require_once( ABSPATH . WPINC . '/classes.php' ); + require_once( ABSPATH . WPINC . '/functions.php' ); + require_once( ABSPATH . WPINC . '/plugin.php' ); $text_direction = /*WP_I18N_TEXT_DIRECTION*/"ltr"/*/WP_I18N_TEXT_DIRECTION*/; wp_die(sprintf(/*WP_I18N_NO_CONFIG*/"There doesn't seem to be a wp-config.php file. I need this before we can get started. Need more help? We got it. You can create a wp-config.php file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.

Create a Configuration File"/*/WP_I18N_NO_CONFIG*/, $path), /*WP_I18N_ERROR_TITLE*/"WordPress › Error"/*/WP_I18N_ERROR_TITLE*/, array('text_direction' => $text_direction));