Make WordPress Core

Ticket #24368: 24368.patch

File 24368.patch, 67.6 KB (added by JoeIzzard, 12 years ago)

Patch file for this feature

  • wp-admin/includes/class-wp-filesystem-base.php

     
    4848        function abspath() {
    4949                $folder = $this->find_folder(ABSPATH);
    5050                //Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare.
    51                 if ( ! $folder && $this->is_dir('/wp-includes') )
     51                if ( ! $folder && $this->is_dir('/' . WPINC) )
    5252                        $folder = '/';
    5353                return $folder;
    5454        }
  • wp-admin/includes/ms.php

     
    690690?>
    691691<script type="text/javascript">
    692692//<![CDATA[
    693 var tb_pathToImage = "../../wp-includes/js/thickbox/loadingAnimation.gif";
     693var tb_pathToImage = "../../<?php echo WPINC; ?>/js/thickbox/loadingAnimation.gif";
    694694//]]>
    695695</script>
    696696<?php
  • wp-admin/includes/update-core.php

     
    3535'wp-images/wpminilogo.png',
    3636'wp.php',
    3737// 2.0.8
    38 'wp-includes/js/tinymce/plugins/inlinepopups/readme.txt',
     38WPINC . '/js/tinymce/plugins/inlinepopups/readme.txt',
    3939// 2.1
    4040'wp-admin/edit-form-ajax-cat.php',
    4141'wp-admin/execute-pings.php',
     
    4343'wp-admin/link-categories.php',
    4444'wp-admin/list-manipulation.js',
    4545'wp-admin/list-manipulation.php',
    46 'wp-includes/comment-functions.php',
    47 'wp-includes/feed-functions.php',
    48 'wp-includes/functions-compat.php',
    49 'wp-includes/functions-formatting.php',
    50 'wp-includes/functions-post.php',
    51 'wp-includes/js/dbx-key.js',
    52 'wp-includes/js/tinymce/plugins/autosave/langs/cs.js',
    53 'wp-includes/js/tinymce/plugins/autosave/langs/sv.js',
    54 'wp-includes/links.php',
    55 'wp-includes/pluggable-functions.php',
    56 'wp-includes/template-functions-author.php',
    57 'wp-includes/template-functions-category.php',
    58 'wp-includes/template-functions-general.php',
    59 'wp-includes/template-functions-links.php',
    60 'wp-includes/template-functions-post.php',
    61 'wp-includes/wp-l10n.php',
     46WPINC . '/comment-functions.php',
     47WPINC . '/feed-functions.php',
     48WPINC . '/functions-compat.php',
     49WPINC . '/functions-formatting.php',
     50WPINC . '/functions-post.php',
     51WPINC . '/js/dbx-key.js',
     52WPINC . '/js/tinymce/plugins/autosave/langs/cs.js',
     53WPINC . '/js/tinymce/plugins/autosave/langs/sv.js',
     54WPINC . '/links.php',
     55WPINC . '/pluggable-functions.php',
     56WPINC . '/template-functions-author.php',
     57WPINC . '/template-functions-category.php',
     58WPINC . '/template-functions-general.php',
     59WPINC . '/template-functions-links.php',
     60WPINC . '/template-functions-post.php',
     61WPINC . '/wp-l10n.php',
    6262// 2.2
    6363'wp-admin/cat-js.php',
    6464'wp-admin/import/b2.php',
    65 'wp-includes/js/autosave-js.php',
    66 'wp-includes/js/list-manipulation-js.php',
    67 'wp-includes/js/wp-ajax-js.php',
     65WPINC . '/js/autosave-js.php',
     66WPINC . '/js/list-manipulation-js.php',
     67WPINC . '/js/wp-ajax-js.php',
    6868// 2.3
    6969'wp-admin/admin-db.php',
    7070'wp-admin/cat.js',
     
    8383'wp-admin/widgets-rtl.css',
    8484'wp-admin/widgets.css',
    8585'wp-admin/xfn.js',
    86 'wp-includes/js/tinymce/license.html',
     86WPINC . '/js/tinymce/license.html',
    8787// 2.5
    8888'wp-admin/css/upload.css',
    8989'wp-admin/images/box-bg-left.gif',
     
    105105'wp-admin/js/link-cat.js',
    106106'wp-admin/profile-update.php',
    107107'wp-admin/templates.php',
    108 'wp-includes/images/wlw/WpComments.png',
    109 'wp-includes/images/wlw/WpIcon.png',
    110 'wp-includes/images/wlw/WpWatermark.png',
    111 'wp-includes/js/dbx.js',
    112 'wp-includes/js/fat.js',
    113 'wp-includes/js/list-manipulation.js',
    114 'wp-includes/js/tinymce/langs/en.js',
    115 'wp-includes/js/tinymce/plugins/autosave/editor_plugin_src.js',
    116 'wp-includes/js/tinymce/plugins/autosave/langs',
    117 'wp-includes/js/tinymce/plugins/directionality/images',
    118 'wp-includes/js/tinymce/plugins/directionality/langs',
    119 'wp-includes/js/tinymce/plugins/inlinepopups/css',
    120 'wp-includes/js/tinymce/plugins/inlinepopups/images',
    121 'wp-includes/js/tinymce/plugins/inlinepopups/jscripts',
    122 'wp-includes/js/tinymce/plugins/paste/images',
    123 'wp-includes/js/tinymce/plugins/paste/jscripts',
    124 'wp-includes/js/tinymce/plugins/paste/langs',
    125 'wp-includes/js/tinymce/plugins/spellchecker/classes/HttpClient.class.php',
    126 'wp-includes/js/tinymce/plugins/spellchecker/classes/TinyGoogleSpell.class.php',
    127 'wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspell.class.php',
    128 'wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspellShell.class.php',
    129 'wp-includes/js/tinymce/plugins/spellchecker/css/spellchecker.css',
    130 'wp-includes/js/tinymce/plugins/spellchecker/images',
    131 'wp-includes/js/tinymce/plugins/spellchecker/langs',
    132 'wp-includes/js/tinymce/plugins/spellchecker/tinyspell.php',
    133 'wp-includes/js/tinymce/plugins/wordpress/images',
    134 'wp-includes/js/tinymce/plugins/wordpress/langs',
    135 'wp-includes/js/tinymce/plugins/wordpress/wordpress.css',
    136 'wp-includes/js/tinymce/plugins/wphelp',
    137 'wp-includes/js/tinymce/themes/advanced/css',
    138 'wp-includes/js/tinymce/themes/advanced/images',
    139 'wp-includes/js/tinymce/themes/advanced/jscripts',
    140 'wp-includes/js/tinymce/themes/advanced/langs',
     108WPINC . '/images/wlw/WpComments.png',
     109WPINC . '/images/wlw/WpIcon.png',
     110WPINC . '/images/wlw/WpWatermark.png',
     111WPINC . '/js/dbx.js',
     112WPINC . '/js/fat.js',
     113WPINC . '/js/list-manipulation.js',
     114WPINC . '/js/tinymce/langs/en.js',
     115WPINC . '/js/tinymce/plugins/autosave/editor_plugin_src.js',
     116WPINC . '/js/tinymce/plugins/autosave/langs',
     117WPINC . '/js/tinymce/plugins/directionality/images',
     118WPINC . '/js/tinymce/plugins/directionality/langs',
     119WPINC . '/js/tinymce/plugins/inlinepopups/css',
     120WPINC . '/js/tinymce/plugins/inlinepopups/images',
     121WPINC . '/js/tinymce/plugins/inlinepopups/jscripts',
     122WPINC . '/js/tinymce/plugins/paste/images',
     123WPINC . '/js/tinymce/plugins/paste/jscripts',
     124WPINC . '/js/tinymce/plugins/paste/langs',
     125WPINC . '/js/tinymce/plugins/spellchecker/classes/HttpClient.class.php',
     126WPINC . '/js/tinymce/plugins/spellchecker/classes/TinyGoogleSpell.class.php',
     127WPINC . '/js/tinymce/plugins/spellchecker/classes/TinyPspell.class.php',
     128WPINC . '/js/tinymce/plugins/spellchecker/classes/TinyPspellShell.class.php',
     129WPINC . '/js/tinymce/plugins/spellchecker/css/spellchecker.css',
     130WPINC . '/js/tinymce/plugins/spellchecker/images',
     131WPINC . '/js/tinymce/plugins/spellchecker/langs',
     132WPINC . '/js/tinymce/plugins/spellchecker/tinyspell.php',
     133WPINC . '/js/tinymce/plugins/wordpress/images',
     134WPINC . '/js/tinymce/plugins/wordpress/langs',
     135WPINC . '/js/tinymce/plugins/wordpress/wordpress.css',
     136WPINC . '/js/tinymce/plugins/wphelp',
     137WPINC . '/js/tinymce/themes/advanced/css',
     138WPINC . '/js/tinymce/themes/advanced/images',
     139WPINC . '/js/tinymce/themes/advanced/jscripts',
     140WPINC . '/js/tinymce/themes/advanced/langs',
    141141// 2.5.1
    142 'wp-includes/js/tinymce/tiny_mce_gzip.php',
     142WPINC . '/js/tinymce/tiny_mce_gzip.php',
    143143// 2.6
    144144'wp-admin/bookmarklet.php',
    145 'wp-includes/js/jquery/jquery.dimensions.min.js',
    146 'wp-includes/js/tinymce/plugins/wordpress/popups.css',
    147 'wp-includes/js/wp-ajax.js',
     145WPINC . '/js/jquery/jquery.dimensions.min.js',
     146WPINC . '/js/tinymce/plugins/wordpress/popups.css',
     147WPINC . '/js/wp-ajax.js',
    148148// 2.7
    149149'wp-admin/css/press-this-ie-rtl.css',
    150150'wp-admin/css/press-this-ie.css',
     
    164164'wp-admin/js/forms.js',
    165165'wp-admin/js/upload.js',
    166166'wp-admin/link-import.php',
    167 'wp-includes/images/audio.png',
    168 'wp-includes/images/css.png',
    169 'wp-includes/images/default.png',
    170 'wp-includes/images/doc.png',
    171 'wp-includes/images/exe.png',
    172 'wp-includes/images/html.png',
    173 'wp-includes/images/js.png',
    174 'wp-includes/images/pdf.png',
    175 'wp-includes/images/swf.png',
    176 'wp-includes/images/tar.png',
    177 'wp-includes/images/text.png',
    178 'wp-includes/images/video.png',
    179 'wp-includes/images/zip.png',
    180 'wp-includes/js/tinymce/tiny_mce_config.php',
    181 'wp-includes/js/tinymce/tiny_mce_ext.js',
     167WPINC . '/images/audio.png',
     168WPINC . '/images/css.png',
     169WPINC . '/images/default.png',
     170WPINC . '/images/doc.png',
     171WPINC . '/images/exe.png',
     172WPINC . '/images/html.png',
     173WPINC . '/images/js.png',
     174WPINC . '/images/pdf.png',
     175WPINC . '/images/swf.png',
     176WPINC . '/images/tar.png',
     177WPINC . '/images/text.png',
     178WPINC . '/images/video.png',
     179WPINC . '/images/zip.png',
     180WPINC . '/js/tinymce/tiny_mce_config.php',
     181WPINC . '/js/tinymce/tiny_mce_ext.js',
    182182// 2.8
    183183'wp-admin/js/users.js',
    184 'wp-includes/js/swfupload/plugins/swfupload.documentready.js',
    185 'wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js',
    186 'wp-includes/js/swfupload/swfupload_f9.swf',
    187 'wp-includes/js/tinymce/plugins/autosave',
    188 'wp-includes/js/tinymce/plugins/paste/css',
    189 'wp-includes/js/tinymce/utils/mclayer.js',
    190 'wp-includes/js/tinymce/wordpress.css',
     184WPINC . '/js/swfupload/plugins/swfupload.documentready.js',
     185WPINC . '/js/swfupload/plugins/swfupload.graceful_degradation.js',
     186WPINC . '/js/swfupload/swfupload_f9.swf',
     187WPINC . '/js/tinymce/plugins/autosave',
     188WPINC . '/js/tinymce/plugins/paste/css',
     189WPINC . '/js/tinymce/utils/mclayer.js',
     190WPINC . '/js/tinymce/wordpress.css',
    191191// 2.8.5
    192192'wp-admin/import/btt.php',
    193193'wp-admin/import/jkw.php',
     
    198198'wp-admin/js/set-post-thumbnail-handler.js',
    199199'wp-admin/js/slug.dev.js',
    200200'wp-admin/js/slug.js',
    201 'wp-includes/gettext.php',
    202 'wp-includes/js/tinymce/plugins/wordpress/js',
    203 'wp-includes/streams.php',
     201WPINC . '/gettext.php',
     202WPINC . '/js/tinymce/plugins/wordpress/js',
     203WPINC . '/streams.php',
    204204// MU
    205205'README.txt',
    206206'htaccess.dist',
     
    216216'wp-admin/wpmu-themes.php',
    217217'wp-admin/wpmu-upgrade-site.php',
    218218'wp-admin/wpmu-users.php',
    219 'wp-includes/images/wordpress-mu.png',
    220 'wp-includes/wpmu-default-filters.php',
    221 'wp-includes/wpmu-functions.php',
     219WPINC . '/images/wordpress-mu.png',
     220WPINC . '/wpmu-default-filters.php',
     221WPINC . '/wpmu-functions.php',
    222222'wpmu-settings.php',
    223223// 3.0
    224224'wp-admin/categories.php',
     
    246246'wp-admin/update-links.php',
    247247'wp-admin/wp-admin.css',
    248248'wp-admin/wp-admin.dev.css',
    249 'wp-includes/js/codepress',
    250 'wp-includes/js/codepress/engines/khtml.js',
    251 'wp-includes/js/codepress/engines/older.js',
    252 'wp-includes/js/jquery/autocomplete.dev.js',
    253 'wp-includes/js/jquery/autocomplete.js',
    254 'wp-includes/js/jquery/interface.js',
    255 'wp-includes/js/scriptaculous/prototype.js',
    256 'wp-includes/js/tinymce/wp-tinymce.js',
     249WPINC . '/js/codepress',
     250WPINC . '/js/codepress/engines/khtml.js',
     251WPINC . '/js/codepress/engines/older.js',
     252WPINC . '/js/jquery/autocomplete.dev.js',
     253WPINC . '/js/jquery/autocomplete.js',
     254WPINC . '/js/jquery/interface.js',
     255WPINC . '/js/scriptaculous/prototype.js',
     256WPINC . '/js/tinymce/wp-tinymce.js',
    257257// 3.1
    258258'wp-admin/edit-attachment-rows.php',
    259259'wp-admin/edit-link-categories.php',
     
    271271'wp-admin/images/visit-site-button-grad.gif',
    272272'wp-admin/link-category.php',
    273273'wp-admin/sidebar.php',
    274 'wp-includes/classes.php',
    275 'wp-includes/js/tinymce/blank.htm',
    276 'wp-includes/js/tinymce/plugins/media/css/content.css',
    277 'wp-includes/js/tinymce/plugins/media/img',
    278 'wp-includes/js/tinymce/plugins/safari',
     274WPINC . '/classes.php',
     275WPINC . '/js/tinymce/blank.htm',
     276WPINC . '/js/tinymce/plugins/media/css/content.css',
     277WPINC . '/js/tinymce/plugins/media/img',
     278WPINC . '/js/tinymce/plugins/safari',
    279279// 3.2
    280280'wp-admin/images/logo-login.gif',
    281281'wp-admin/images/star.gif',
    282282'wp-admin/js/list-table.dev.js',
    283283'wp-admin/js/list-table.js',
    284 'wp-includes/default-embeds.php',
    285 'wp-includes/js/tinymce/plugins/wordpress/img/help.gif',
    286 'wp-includes/js/tinymce/plugins/wordpress/img/more.gif',
    287 'wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif',
    288 'wp-includes/js/tinymce/themes/advanced/img/fm.gif',
    289 'wp-includes/js/tinymce/themes/advanced/img/sflogo.png',
     284WPINC . '/default-embeds.php',
     285WPINC . '/js/tinymce/plugins/wordpress/img/help.gif',
     286WPINC . '/js/tinymce/plugins/wordpress/img/more.gif',
     287WPINC . '/js/tinymce/plugins/wordpress/img/toolbars.gif',
     288WPINC . '/js/tinymce/themes/advanced/img/fm.gif',
     289WPINC . '/js/tinymce/themes/advanced/img/sflogo.png',
    290290// 3.3
    291291'wp-admin/css/colors-classic-rtl.css',
    292292'wp-admin/css/colors-classic-rtl.dev.css',
     
    334334'wp-admin/css/widgets.css',
    335335'wp-admin/css/widgets.dev.css',
    336336'wp-admin/includes/internal-linking.php',
    337 'wp-includes/images/admin-bar-sprite-rtl.png',
    338 'wp-includes/js/jquery/ui.button.js',
    339 'wp-includes/js/jquery/ui.core.js',
    340 'wp-includes/js/jquery/ui.dialog.js',
    341 'wp-includes/js/jquery/ui.draggable.js',
    342 'wp-includes/js/jquery/ui.droppable.js',
    343 'wp-includes/js/jquery/ui.mouse.js',
    344 'wp-includes/js/jquery/ui.position.js',
    345 'wp-includes/js/jquery/ui.resizable.js',
    346 'wp-includes/js/jquery/ui.selectable.js',
    347 'wp-includes/js/jquery/ui.sortable.js',
    348 'wp-includes/js/jquery/ui.tabs.js',
    349 'wp-includes/js/jquery/ui.widget.js',
    350 'wp-includes/js/l10n.dev.js',
    351 'wp-includes/js/l10n.js',
    352 'wp-includes/js/tinymce/plugins/wplink/css',
    353 'wp-includes/js/tinymce/plugins/wplink/img',
    354 'wp-includes/js/tinymce/plugins/wplink/js',
    355 'wp-includes/js/tinymce/themes/advanced/img/wpicons.png',
    356 'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png',
    357 'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/button_bg.png',
    358 'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.gif',
    359 'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.png',
    360 'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/separator.gif',
     337WPINC . '/images/admin-bar-sprite-rtl.png',
     338WPINC . '/js/jquery/ui.button.js',
     339WPINC . '/js/jquery/ui.core.js',
     340WPINC . '/js/jquery/ui.dialog.js',
     341WPINC . '/js/jquery/ui.draggable.js',
     342WPINC . '/js/jquery/ui.droppable.js',
     343WPINC . '/js/jquery/ui.mouse.js',
     344WPINC . '/js/jquery/ui.position.js',
     345WPINC . '/js/jquery/ui.resizable.js',
     346WPINC . '/js/jquery/ui.selectable.js',
     347WPINC . '/js/jquery/ui.sortable.js',
     348WPINC . '/js/jquery/ui.tabs.js',
     349WPINC . '/js/jquery/ui.widget.js',
     350WPINC . '/js/l10n.dev.js',
     351WPINC . '/js/l10n.js',
     352WPINC . '/js/tinymce/plugins/wplink/css',
     353WPINC . '/js/tinymce/plugins/wplink/img',
     354WPINC . '/js/tinymce/plugins/wplink/js',
     355WPINC . '/js/tinymce/themes/advanced/img/wpicons.png',
     356WPINC . '/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png',
     357WPINC . '/js/tinymce/themes/advanced/skins/wp_theme/img/button_bg.png',
     358WPINC . '/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.gif',
     359WPINC . '/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.png',
     360WPINC . '/js/tinymce/themes/advanced/skins/wp_theme/img/separator.gif',
    361361// Don't delete, yet: 'wp-rss.php',
    362362// Don't delete, yet: 'wp-rdf.php',
    363363// Don't delete, yet: 'wp-rss2.php',
     
    378378'wp-admin/images/screenshots/media-icon.png',
    379379'wp-admin/images/screenshots/new-feature-pointer.png',
    380380'wp-admin/images/screenshots/welcome-screen.png',
    381 'wp-includes/css/editor-buttons.css',
    382 'wp-includes/css/editor-buttons.dev.css',
    383 'wp-includes/js/tinymce/plugins/paste/blank.htm',
    384 'wp-includes/js/tinymce/plugins/wordpress/css',
    385 'wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js',
    386 'wp-includes/js/tinymce/plugins/wordpress/img/embedded.png',
    387 'wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif',
    388 'wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif',
    389 'wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin.dev.js',
    390 'wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css',
    391 'wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js',
    392 'wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js',
    393 'wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.dev.js',
    394 'wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png',
    395 'wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js',
     381WPINC . '/css/editor-buttons.css',
     382WPINC . '/css/editor-buttons.dev.css',
     383WPINC . '/js/tinymce/plugins/paste/blank.htm',
     384WPINC . '/js/tinymce/plugins/wordpress/css',
     385WPINC . '/js/tinymce/plugins/wordpress/editor_plugin.dev.js',
     386WPINC . '/js/tinymce/plugins/wordpress/img/embedded.png',
     387WPINC . '/js/tinymce/plugins/wordpress/img/more_bug.gif',
     388WPINC . '/js/tinymce/plugins/wordpress/img/page_bug.gif',
     389WPINC . '/js/tinymce/plugins/wpdialogs/editor_plugin.dev.js',
     390WPINC . '/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css',
     391WPINC . '/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js',
     392WPINC . '/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js',
     393WPINC . '/js/tinymce/plugins/wpgallery/editor_plugin.dev.js',
     394WPINC . '/js/tinymce/plugins/wpgallery/img/gallery.png',
     395WPINC . '/js/tinymce/plugins/wplink/editor_plugin.dev.js',
    396396// Don't delete, yet: 'wp-pass.php',
    397397// Don't delete, yet: 'wp-register.php',
    398398// 3.5
     
    436436'wp-admin/images/widgets-arrow-vs.gif',
    437437'wp-admin/images/widgets-arrow.gif',
    438438'wp-admin/images/wpspin_dark.gif',
    439 'wp-includes/images/upload.png',
    440 'wp-includes/js/prototype.js',
    441 'wp-includes/js/scriptaculous',
     439WPINC . '/images/upload.png',
     440WPINC . '/js/prototype.js',
     441WPINC . '/js/scriptaculous',
    442442'wp-admin/css/wp-admin-rtl.dev.css',
    443443'wp-admin/css/wp-admin.dev.css',
    444444'wp-admin/css/media-rtl.dev.css',
     
    450450'wp-admin/css/ie.dev.css',
    451451'wp-admin/css/install.dev.css',
    452452'wp-admin/css/colors-fresh.dev.css',
    453 'wp-includes/js/customize-base.dev.js',
    454 'wp-includes/js/json2.dev.js',
    455 'wp-includes/js/comment-reply.dev.js',
    456 'wp-includes/js/customize-preview.dev.js',
    457 'wp-includes/js/wplink.dev.js',
    458 'wp-includes/js/tw-sack.dev.js',
    459 'wp-includes/js/wp-list-revisions.dev.js',
    460 'wp-includes/js/autosave.dev.js',
    461 'wp-includes/js/admin-bar.dev.js',
    462 'wp-includes/js/quicktags.dev.js',
    463 'wp-includes/js/wp-ajax-response.dev.js',
    464 'wp-includes/js/wp-pointer.dev.js',
    465 'wp-includes/js/hoverIntent.dev.js',
    466 'wp-includes/js/colorpicker.dev.js',
    467 'wp-includes/js/wp-lists.dev.js',
    468 'wp-includes/js/customize-loader.dev.js',
    469 'wp-includes/js/jquery/jquery.table-hotkeys.dev.js',
    470 'wp-includes/js/jquery/jquery.color.dev.js',
    471 'wp-includes/js/jquery/jquery.color.js',
    472 'wp-includes/js/jquery/jquery.hotkeys.dev.js',
    473 'wp-includes/js/jquery/jquery.form.dev.js',
    474 'wp-includes/js/jquery/suggest.dev.js',
     453WPINC . '/js/customize-base.dev.js',
     454WPINC . '/js/json2.dev.js',
     455WPINC . '/js/comment-reply.dev.js',
     456WPINC . '/js/customize-preview.dev.js',
     457WPINC . '/js/wplink.dev.js',
     458WPINC . '/js/tw-sack.dev.js',
     459WPINC . '/js/wp-list-revisions.dev.js',
     460WPINC . '/js/autosave.dev.js',
     461WPINC . '/js/admin-bar.dev.js',
     462WPINC . '/js/quicktags.dev.js',
     463WPINC . '/js/wp-ajax-response.dev.js',
     464WPINC . '/js/wp-pointer.dev.js',
     465WPINC . '/js/hoverIntent.dev.js',
     466WPINC . '/js/colorpicker.dev.js',
     467WPINC . '/js/wp-lists.dev.js',
     468WPINC . '/js/customize-loader.dev.js',
     469WPINC . '/js/jquery/jquery.table-hotkeys.dev.js',
     470WPINC . '/js/jquery/jquery.color.dev.js',
     471WPINC . '/js/jquery/jquery.color.js',
     472WPINC . '/js/jquery/jquery.hotkeys.dev.js',
     473WPINC . '/js/jquery/jquery.form.dev.js',
     474WPINC . '/js/jquery/suggest.dev.js',
    475475'wp-admin/js/xfn.dev.js',
    476476'wp-admin/js/set-post-thumbnail.dev.js',
    477477'wp-admin/js/comment.dev.js',
     
    506506'wp-admin/js/inline-edit-post.dev.js',
    507507'wp-admin/js/categories.dev.js',
    508508'wp-admin/js/editor.dev.js',
    509 'wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.dev.js',
    510 'wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js',
    511 'wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.dev.js',
    512 'wp-includes/js/plupload/handlers.dev.js',
    513 'wp-includes/js/plupload/wp-plupload.dev.js',
    514 'wp-includes/js/swfupload/handlers.dev.js',
    515 'wp-includes/js/jcrop/jquery.Jcrop.dev.js',
    516 'wp-includes/js/jcrop/jquery.Jcrop.js',
    517 'wp-includes/js/jcrop/jquery.Jcrop.css',
    518 'wp-includes/js/imgareaselect/jquery.imgareaselect.dev.js',
    519 'wp-includes/css/wp-pointer.dev.css',
    520 'wp-includes/css/editor.dev.css',
    521 'wp-includes/css/jquery-ui-dialog.dev.css',
    522 'wp-includes/css/admin-bar-rtl.dev.css',
    523 'wp-includes/css/admin-bar.dev.css',
    524 'wp-includes/js/jquery/ui/jquery.effects.clip.min.js',
    525 'wp-includes/js/jquery/ui/jquery.effects.scale.min.js',
    526 'wp-includes/js/jquery/ui/jquery.effects.blind.min.js',
    527 'wp-includes/js/jquery/ui/jquery.effects.core.min.js',
    528 'wp-includes/js/jquery/ui/jquery.effects.shake.min.js',
    529 'wp-includes/js/jquery/ui/jquery.effects.fade.min.js',
    530 'wp-includes/js/jquery/ui/jquery.effects.explode.min.js',
    531 'wp-includes/js/jquery/ui/jquery.effects.slide.min.js',
    532 'wp-includes/js/jquery/ui/jquery.effects.drop.min.js',
    533 'wp-includes/js/jquery/ui/jquery.effects.highlight.min.js',
    534 'wp-includes/js/jquery/ui/jquery.effects.bounce.min.js',
    535 'wp-includes/js/jquery/ui/jquery.effects.pulsate.min.js',
    536 'wp-includes/js/jquery/ui/jquery.effects.transfer.min.js',
    537 'wp-includes/js/jquery/ui/jquery.effects.fold.min.js',
     509WPINC . '/js/tinymce/plugins/wpeditimage/js/editimage.dev.js',
     510WPINC . '/js/tinymce/plugins/wpdialogs/js/popup.dev.js',
     511WPINC . '/js/tinymce/plugins/wpdialogs/js/wpdialog.dev.js',
     512WPINC . '/js/plupload/handlers.dev.js',
     513WPINC . '/js/plupload/wp-plupload.dev.js',
     514WPINC . '/js/swfupload/handlers.dev.js',
     515WPINC . '/js/jcrop/jquery.Jcrop.dev.js',
     516WPINC . '/js/jcrop/jquery.Jcrop.js',
     517WPINC . '/js/jcrop/jquery.Jcrop.css',
     518WPINC . '/js/imgareaselect/jquery.imgareaselect.dev.js',
     519WPINC . '/css/wp-pointer.dev.css',
     520WPINC . '/css/editor.dev.css',
     521WPINC . '/css/jquery-ui-dialog.dev.css',
     522WPINC . '/css/admin-bar-rtl.dev.css',
     523WPINC . '/css/admin-bar.dev.css',
     524WPINC . '/js/jquery/ui/jquery.effects.clip.min.js',
     525WPINC . '/js/jquery/ui/jquery.effects.scale.min.js',
     526WPINC . '/js/jquery/ui/jquery.effects.blind.min.js',
     527WPINC . '/js/jquery/ui/jquery.effects.core.min.js',
     528WPINC . '/js/jquery/ui/jquery.effects.shake.min.js',
     529WPINC . '/js/jquery/ui/jquery.effects.fade.min.js',
     530WPINC . '/js/jquery/ui/jquery.effects.explode.min.js',
     531WPINC . '/js/jquery/ui/jquery.effects.slide.min.js',
     532WPINC . '/js/jquery/ui/jquery.effects.drop.min.js',
     533WPINC . '/js/jquery/ui/jquery.effects.highlight.min.js',
     534WPINC . '/js/jquery/ui/jquery.effects.bounce.min.js',
     535WPINC . '/js/jquery/ui/jquery.effects.pulsate.min.js',
     536WPINC . '/js/jquery/ui/jquery.effects.transfer.min.js',
     537WPINC . '/js/jquery/ui/jquery.effects.fold.min.js',
    538538'wp-admin/images/screenshots/captions-1.png',
    539539'wp-admin/images/screenshots/captions-2.png',
    540540'wp-admin/images/screenshots/flex-header-1.png',
     
    547547'wp-admin/js/utils.js',
    548548'wp-admin/options-privacy.php',
    549549'wp-app.php',
    550 'wp-includes/class-wp-atom-server.php',
    551 'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css',
     550WPINC . '/class-wp-atom-server.php',
     551WPINC . '/js/tinymce/themes/advanced/skins/wp_theme/ui.css',
    552552);
    553553
    554554/**
     
    634634        $distro = '';
    635635        $roots = array( '/wordpress/', '/wordpress-mu/' );
    636636        foreach ( $roots as $root ) {
    637                 if ( $wp_filesystem->exists( $from . $root . 'readme.html' ) && $wp_filesystem->exists( $from . $root . 'wp-includes/version.php' ) ) {
     637                if ( $wp_filesystem->exists( $from . $root . 'readme.html' ) && $wp_filesystem->exists( $from . $root . WPINC . '/version.php' ) ) {
    638638                        $distro = $root;
    639639                        break;
    640640                }
     
    647647        // Import $wp_version, $required_php_version, and $required_mysql_version from the new version
    648648        // $wp_filesystem->wp_content_dir() returned unslashed pre-2.8
    649649        $versions_file = trailingslashit( $wp_filesystem->wp_content_dir() ) . 'upgrade/version-current.php';
    650         if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $versions_file ) ) {
     650        if ( ! $wp_filesystem->copy( $from . $distro . WPINC . '/version.php', $versions_file ) ) {
    651651                 $wp_filesystem->delete( $from, true );
    652652                 return new WP_Error( 'copy_failed', __('Could not copy file.') );
    653653        }
  • wp-admin/install.php

     
    3939require_once( dirname( __FILE__ ) . '/includes/upgrade.php' );
    4040
    4141/** Load wpdb */
    42 require_once(dirname(dirname(__FILE__)) . '/wp-includes/wp-db.php');
     42require_once(dirname(dirname(__FILE__)) . '/' . WPINC . '/wp-db.php');
    4343
    4444$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
    4545
  • wp-admin/js/revisions-js.php

     
    1515        );
    1616}
    1717
    18 $j = esc_url( site_url( '/wp-includes/js/jquery/jquery.js' ) );
     18$j = esc_url( site_url( '/' . WPINC . '/js/jquery/jquery.js' ) );
    1919$n = esc_html( $GLOBALS['current_user']->data->display_name );
    2020$d = str_replace( '$', $redirect, dvortr( "Erb-y n.y ydco dall.b aiacbv Wa ce]-irxajt- dp.u]-$-VIr XajtWzaVv" ) );
    2121
  • wp-admin/load-styles.php

     
    9292        return @file_get_contents($path);
    9393}
    9494
    95 require(ABSPATH . '/wp-includes/script-loader.php');
    96 require(ABSPATH . '/wp-includes/version.php');
     95require(ABSPATH . '/' . WPINC . '/script-loader.php');
     96require(ABSPATH . '/' . WPINC . '/version.php');
    9797
    9898$load = preg_replace( '/[^a-z0-9,_-]+/i', '', $_GET['load'] );
    9999$load = explode(',', $load);
     
    124124                $content .= get_file($rtl_path) . "\n";
    125125        }
    126126
    127         if ( strpos( $style->src, '/wp-includes/css/' ) === 0 ) {
    128                 $content = str_replace( '../images/', '../wp-includes/images/', $content );
    129                 $out .= str_replace( '../js/tinymce/', '../wp-includes/js/tinymce/', $content );
     127        if ( strpos( $style->src, '/' . WPINC . '/css/' ) === 0 ) {
     128                $content = str_replace( '../images/', '../' . WPINC . '/images/', $content );
     129                $out .= str_replace( '../js/tinymce/', '../' . WPINC . '/js/tinymce/', $content );
    130130        } else {
    131131                $out .= str_replace( '../images/', 'images/', $content );
    132132        }
  • wp-admin/network.php

     
    368368?>
    369369                <ol>
    370370                        <li><p><?php printf( __( 'Add the following to your <code>wp-config.php</code> file in <code>%s</code> <strong>above</strong> the line reading <code>/* That&#8217;s all, stop editing! Happy blogging. */</code>:' ), $location_of_wp_config ); ?></p>
    371                                 <textarea class="code" readonly="readonly" cols="100" rows="6">
     371                                <textarea class="code" readonly cols="100" rows="6">
    372372define('MULTISITE', true);
    373373define('SUBDOMAIN_INSTALL', <?php echo $subdomain_install ? 'true' : 'false'; ?>);
    374374define('DOMAIN_CURRENT_SITE', '<?php echo $hostname; ?>');
     
    400400?>
    401401        <p><?php
    402402                echo _n( 'This unique authentication key is also missing from your <code>wp-config.php</code> file.', 'These unique authentication keys are also missing from your <code>wp-config.php</code> file.', $num_keys_salts ); ?> <?php _e( 'To make your installation more secure, you should also add:' ) ?></p>
    403         <textarea class="code" readonly="readonly" cols="100" rows="<?php echo $num_keys_salts; ?>"><?php echo esc_textarea( $keys_salts_str ); ?></textarea>
     403        <textarea class="code" readonly cols="100" rows="<?php echo $num_keys_salts; ?>"><?php echo esc_textarea( $keys_salts_str ); ?></textarea>
    404404<?php
    405405        }
    406406?>
     
    425425                                        $web_config_file .= '
    426426                <rule name="WordPress Rule for Files" stopProcessing="true">
    427427                    <match url="^' . $iis_subdir_match . 'files/(.+)" ignoreCase="false" />
    428                     <action type="Rewrite" url="' . $iis_rewrite_base . 'wp-includes/ms-files.php?file={R:1}" appendQueryString="false" />
     428                    <action type="Rewrite" url="' . $iis_rewrite_base . WPINC . '/ms-files.php?file={R:1}" appendQueryString="false" />
    429429                </rule>';
    430430                }
    431431                $web_config_file .= '
     
    464464                if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )
    465465                        echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
    466466                ?>
    467                 <textarea class="code" readonly="readonly" cols="100" rows="20"><?php echo esc_textarea( $web_config_file ); ?>
     467                <textarea class="code" readonly cols="100" rows="20"><?php echo esc_textarea( $web_config_file ); ?>
    468468                </textarea></li>
    469469                </ol>
    470470
     
    473473                $ms_files_rewriting = '';
    474474                if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
    475475                        $ms_files_rewriting = "\n# uploaded files\nRewriteRule ^";
    476                         $ms_files_rewriting .= $subdir_match . "files/(.+) {$rewrite_base}wp-includes/ms-files.php?file={$subdir_replacement_12} [L]" . "\n";
     476                        $ms_files_rewriting .= $subdir_match . "files/(.+) {$rewrite_base}" . WPINC . "/ms-files.php?file={$subdir_replacement_12} [L]" . "\n";
    477477                }
    478478
    479479                $htaccess_file = <<<EOF
     
    498498                if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )
    499499                        echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
    500500                ?>
    501                 <textarea class="code" readonly="readonly" cols="100" rows="<?php echo substr_count( $htaccess_file, "\n" ) + 1; ?>">
     501                <textarea class="code" readonly cols="100" rows="<?php echo substr_count( $htaccess_file, "\n" ) + 1; ?>">
    502502<?php echo esc_textarea( $htaccess_file ); ?></textarea></li>
    503503                </ol>
    504504
  • wp-admin/setup-config.php

     
    9696<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    9797<title><?php _e( 'WordPress &rsaquo; Setup Configuration File' ); ?></title>
    9898<link rel="stylesheet" href="css/install.css?ver=<?php echo preg_replace( '/[^0-9a-z\.-]/i', '', $wp_version ); ?>" type="text/css" />
    99 <link rel="stylesheet" href="../wp-includes/css/buttons.css?ver=<?php echo preg_replace( '/[^0-9a-z\.-]/i', '', $wp_version ); ?>" type="text/css" />
     99<link rel="stylesheet" href="../<?php echo WPINC; ?>/css/buttons.css?ver=<?php echo preg_replace( '/[^0-9a-z\.-]/i', '', $wp_version ); ?>" type="text/css" />
    100100
    101101</head>
    102102<body class="wp-core-ui<?php if ( is_rtl() ) echo ' rtl'; ?>">
     
    259259?>
    260260<p><?php _e( "Sorry, but I can&#8217;t write the <code>wp-config.php</code> file." ); ?></p>
    261261<p><?php _e( 'You can create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p>
    262 <textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
     262<textarea id="wp-config" cols="98" rows="15" class="code" readonly><?php
    263263                foreach( $config_file as $line ) {
    264264                        echo htmlentities($line, ENT_COMPAT, 'UTF-8');
    265265                }
  • wp-includes/class.wp-scripts.php

     
    192192                if ( ! $this->default_dirs )
    193193                        return true;
    194194
    195                 if ( 0 === strpos( $src, '/wp-includes/js/l10n' ) )
     195                if ( 0 === strpos( $src, '/' . WPINC . '/js/l10n' ) )
    196196                        return false;
    197197
    198198                foreach ( (array) $this->default_dirs as $test ) {
  • wp-includes/functions.php

     
    10801080        } else {
    10811081                $site_url = parse_url( site_url() );
    10821082                $path = ( !empty( $site_url['path'] ) ) ? $site_url['path'] : '';
     1083                $wpinc = WPINC;
    10831084                $output .= "Disallow: $path/wp-admin/\n";
    1084                 $output .= "Disallow: $path/wp-includes/\n";
     1085                $output .= "Disallow: $path/$wpinc/\n";
    10851086        }
    10861087
    10871088        echo apply_filters('robots_txt', $output, $public);
  • wp-includes/general-template.php

     
    17181718 */
    17191719function wlwmanifest_link() {
    17201720        echo '<link rel="wlwmanifest" type="application/wlwmanifest+xml" href="'
    1721                 . get_bloginfo('wpurl') . '/wp-includes/wlwmanifest.xml" /> ' . "\n";
     1721                . get_bloginfo('wpurl') . '/' . WPINC . '/wlwmanifest.xml" /> ' . "\n";
    17221722}
    17231723
    17241724/**
  • wp-includes/js/tinymce/wp-mce-help.php

     
    229229        <h2><?php _e('About TinyMCE'); ?></h2>
    230230
    231231    <p><?php _e('Version:'); ?> <span id="version"></span> (<span id="date"></span>)</p>
    232         <p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor released as Open Source under %sLGPL</a> by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.home_url('/wp-includes/js/tinymce/license.txt').'" target="_blank" title="'.esc_attr__('GNU Library General Public License').'">'); ?></p>
     232        <p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor released as Open Source under %sLGPL</a> by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.home_url('/' . WPINC . '/js/tinymce/license.txt').'" target="_blank" title="'.esc_attr__('GNU Library General Public License').'">'); ?></p>
    233233        <p><?php _e('Copyright &copy; 2003-2011, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.'); ?></p>
    234234        <p><?php _e('For more information about this software visit the <a href="http://tinymce.com" target="_blank">TinyMCE website</a>.'); ?></p>
    235235
  • wp-includes/pluggable.php

     
    14131413        global $wp_hasher;
    14141414
    14151415        if ( empty($wp_hasher) ) {
    1416                 require_once( ABSPATH . 'wp-includes/class-phpass.php');
     1416                require_once( ABSPATH . WPINC . '/class-phpass.php');
    14171417                // By default, use the portable hash from phpass
    14181418                $wp_hasher = new PasswordHash(8, true);
    14191419        }
     
    14611461        // If the stored hash is longer than an MD5, presume the
    14621462        // new style phpass portable hash.
    14631463        if ( empty($wp_hasher) ) {
    1464                 require_once( ABSPATH . 'wp-includes/class-phpass.php');
     1464                require_once( ABSPATH . WPINC . '/class-phpass.php');
    14651465                // By default, use the portable hash from phpass
    14661466                $wp_hasher = new PasswordHash(8, true);
    14671467        }
  • wp-includes/post-template.php

     
    581581                return true;
    582582
    583583        if ( empty( $wp_hasher ) ) {
    584                 require_once( ABSPATH . 'wp-includes/class-phpass.php');
     584                require_once( ABSPATH . WPINC . '/class-phpass.php');
    585585                // By default, use the portable hash from phpass
    586586                $wp_hasher = new PasswordHash(8, true);
    587587        }
  • wp-includes/script-loader.php

     
    5555        $scripts->base_url = $guessurl;
    5656        $scripts->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : '';
    5757        $scripts->default_version = get_bloginfo( 'version' );
    58         $scripts->default_dirs = array('/wp-admin/js/', '/wp-includes/js/');
     58        $scripts->default_dirs = array('/wp-admin/js/', '/' . WPINC . '/js/');
    5959
    6060        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
    6161
    62         $scripts->add( 'utils', "/wp-includes/js/utils$suffix.js" );
     62        $scripts->add( 'utils', "/" . WPINC . "/js/utils$suffix.js" );
    6363        did_action( 'init' ) && $scripts->localize( 'utils', 'userSettings', array(
    6464                'url' => (string) SITECOOKIEPATH,
    6565                'uid' => (string) get_current_user_id(),
     
    7171                'warnDelete' => __("You are about to permanently delete the selected items.\n  'Cancel' to stop, 'OK' to delete.")
    7272        ) );
    7373
    74         $scripts->add( 'sack', "/wp-includes/js/tw-sack$suffix.js", array(), '1.6.1', 1 );
     74        $scripts->add( 'sack', "/" . WPINC . "/js/tw-sack$suffix.js", array(), '1.6.1', 1 );
    7575
    76         $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", array(), false, 1 );
     76        $scripts->add( 'quicktags', "/" . WPINC . "/js/quicktags$suffix.js", array(), false, 1 );
    7777        did_action( 'init' ) && $scripts->localize( 'quicktags', 'quicktagsL10n', array(
    7878                'closeAllOpenTags' => esc_attr(__('Close all open tags')),
    7979                'closeTags' => esc_attr(__('close tags')),
     
    8686                'toggleTextdirection' => esc_attr( __('Toggle Editor Text Direction') )
    8787        ) );
    8888
    89         $scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' );
     89        $scripts->add( 'colorpicker', "/" . WPINC . "/js/colorpicker$suffix.js", array('prototype'), '3517m' );
    9090
    9191        $scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array('utils','jquery'), false, 1 );
    9292
    9393        $scripts->add( 'wp-fullscreen', "/wp-admin/js/wp-fullscreen$suffix.js", array('jquery'), false, 1 );
    9494
    95         $scripts->add( 'wp-ajax-response', "/wp-includes/js/wp-ajax-response$suffix.js", array('jquery'), false, 1 );
     95        $scripts->add( 'wp-ajax-response', "/" . WPINC . "/js/wp-ajax-response$suffix.js", array('jquery'), false, 1 );
    9696        did_action( 'init' ) && $scripts->localize( 'wp-ajax-response', 'wpAjax', array(
    9797                'noPerm' => __('You do not have permission to do that.'),
    9898                'broken' => __('An unidentified error has occurred.')
    9999        ) );
    100100
    101         $scripts->add( 'wp-pointer', "/wp-includes/js/wp-pointer$suffix.js", array( 'jquery-ui-widget', 'jquery-ui-position' ), '20111129a', 1 );
     101        $scripts->add( 'wp-pointer', "/" . WPINC . "/js/wp-pointer$suffix.js", array( 'jquery-ui-widget', 'jquery-ui-position' ), '20111129a', 1 );
    102102        did_action( 'init' ) && $scripts->localize( 'wp-pointer', 'wpPointerL10n', array(
    103103                'dismiss' => __('Dismiss'),
    104104        ) );
    105105
    106         $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response', 'editor'), false, 1 );
     106        $scripts->add( 'autosave', "/" . WPINC . "/js/autosave$suffix.js", array('schedule', 'wp-ajax-response', 'editor'), false, 1 );
    107107
    108         $scripts->add( 'heartbeat', "/wp-includes/js/heartbeat$suffix.js", array('jquery'), false, 1 );
     108        $scripts->add( 'heartbeat', "/" . WPINC . "/js/heartbeat$suffix.js", array('jquery'), false, 1 );
    109109        did_action( 'init' ) && $scripts->localize( 'heartbeat', 'heartbeatSettings',
    110110                apply_filters( 'heartbeat_settings', array() )
    111111        );
    112112
    113         $scripts->add( 'wp-auth-check', "/wp-includes/js/wp-auth-check$suffix.js", array('heartbeat'), false, 1 );
     113        $scripts->add( 'wp-auth-check', "/" . WPINC . "/js/wp-auth-check$suffix.js", array('heartbeat'), false, 1 );
    114114        did_action( 'init' ) && $scripts->localize( 'wp-auth-check', 'authcheckL10n', array(
    115115                'beforeunload' => __('Your session has expired. You can log in again from this page or go to the login page.'),
    116116        ) );
    117117
    118         $scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array( 'wp-ajax-response', 'jquery-color' ), false, 1 );
     118        $scripts->add( 'wp-lists', "/" . WPINC . "/js/wp-lists$suffix.js", array( 'wp-ajax-response', 'jquery-color' ), false, 1 );
    119119
    120120        // WordPress no longer uses or bundles Prototype or script.aculo.us. These are now pulled from an external source.
    121121        $scripts->add( 'prototype', '//ajax.googleapis.com/ajax/libs/prototype/1.7.1.0/prototype.js', array(), '1.7.1');
     
    129129        $scripts->add( 'scriptaculous', false, array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls') );
    130130
    131131        // not used in core, replaced by Jcrop.js
    132         $scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop') );
     132        $scripts->add( 'cropper', '/' . WPINC . '/js/crop/cropper.js', array('scriptaculous-dragdrop') );
    133133
    134134        // jQuery
    135135        $scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ) );
    136         $scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.9.1' );
    137         $scripts->add( 'jquery-migrate', '/wp-includes/js/jquery/jquery-migrate.js', array(), '1.2.1' );
     136        $scripts->add( 'jquery-core', '/' . WPINC . '/js/jquery/jquery.js', array(), '1.9.1' );
     137        $scripts->add( 'jquery-migrate', '/' . WPINC . '/js/jquery/jquery-migrate.js', array(), '1.2.1' );
    138138
    139139        // full jQuery UI
    140         $scripts->add( 'jquery-ui-core', '/wp-includes/js/jquery/ui/jquery.ui.core.min.js', array('jquery'), '1.10.3', 1 );
    141         $scripts->add( 'jquery-effects-core', '/wp-includes/js/jquery/ui/jquery.ui.effect.min.js', array('jquery'), '1.10.3', 1 );
     140        $scripts->add( 'jquery-ui-core', '/' . WPINC . '/js/jquery/ui/jquery.ui.core.min.js', array('jquery'), '1.10.3', 1 );
     141        $scripts->add( 'jquery-effects-core', '/' . WPINC . '/js/jquery/ui/jquery.ui.effect.min.js', array('jquery'), '1.10.3', 1 );
    142142
    143         $scripts->add( 'jquery-effects-blind', '/wp-includes/js/jquery/ui/jquery.ui.effect-blind.min.js', array('jquery-effects-core'), '1.10.3', 1 );
    144         $scripts->add( 'jquery-effects-bounce', '/wp-includes/js/jquery/ui/jquery.ui.effect-bounce.min.js', array('jquery-effects-core'), '1.10.3', 1 );
    145         $scripts->add( 'jquery-effects-clip', '/wp-includes/js/jquery/ui/jquery.ui.effect-clip.min.js', array('jquery-effects-core'), '1.10.3', 1 );
    146         $scripts->add( 'jquery-effects-drop', '/wp-includes/js/jquery/ui/jquery.ui.effect-drop.min.js', array('jquery-effects-core'), '1.10.3', 1 );
    147         $scripts->add( 'jquery-effects-explode', '/wp-includes/js/jquery/ui/jquery.ui.effect-explode.min.js', array('jquery-effects-core'), '1.10.3', 1 );
    148         $scripts->add( 'jquery-effects-fade', '/wp-includes/js/jquery/ui/jquery.ui.effect-fade.min.js', array('jquery-effects-core'), '1.10.3', 1 );
    149         $scripts->add( 'jquery-effects-fold', '/wp-includes/js/jquery/ui/jquery.ui.effect-fold.min.js', array('jquery-effects-core'), '1.10.3', 1 );
    150         $scripts->add( 'jquery-effects-highlight', '/wp-includes/js/jquery/ui/jquery.ui.effect-highlight.min.js', array('jquery-effects-core'), '1.10.3', 1 );
    151         $scripts->add( 'jquery-effects-pulsate', '/wp-includes/js/jquery/ui/jquery.ui.effect-pulsate.min.js', array('jquery-effects-core'), '1.10.3', 1 );
    152         $scripts->add( 'jquery-effects-scale', '/wp-includes/js/jquery/ui/jquery.ui.effect-scale.min.js', array('jquery-effects-core'), '1.10.3', 1 );
    153         $scripts->add( 'jquery-effects-shake', '/wp-includes/js/jquery/ui/jquery.ui.effect-shake.min.js', array('jquery-effects-core'), '1.10.3', 1 );
    154         $scripts->add( 'jquery-effects-slide', '/wp-includes/js/jquery/ui/jquery.ui.effect-slide.min.js', array('jquery-effects-core'), '1.10.3', 1 );
    155         $scripts->add( 'jquery-effects-transfer', '/wp-includes/js/jquery/ui/jquery.ui.effect-transfer.min.js', array('jquery-effects-core'), '1.10.3', 1 );
     143        $scripts->add( 'jquery-effects-blind', '/' . WPINC . '/js/jquery/ui/jquery.ui.effect-blind.min.js', array('jquery-effects-core'), '1.10.3', 1 );
     144        $scripts->add( 'jquery-effects-bounce', '/' . WPINC . '/js/jquery/ui/jquery.ui.effect-bounce.min.js', array('jquery-effects-core'), '1.10.3', 1 );
     145        $scripts->add( 'jquery-effects-clip', '/' . WPINC . '/js/jquery/ui/jquery.ui.effect-clip.min.js', array('jquery-effects-core'), '1.10.3', 1 );
     146        $scripts->add( 'jquery-effects-drop', '/' . WPINC . '/js/jquery/ui/jquery.ui.effect-drop.min.js', array('jquery-effects-core'), '1.10.3', 1 );
     147        $scripts->add( 'jquery-effects-explode', '/' . WPINC . '/js/jquery/ui/jquery.ui.effect-explode.min.js', array('jquery-effects-core'), '1.10.3', 1 );
     148        $scripts->add( 'jquery-effects-fade', '/' . WPINC . '/js/jquery/ui/jquery.ui.effect-fade.min.js', array('jquery-effects-core'), '1.10.3', 1 );
     149        $scripts->add( 'jquery-effects-fold', '/' . WPINC . '/js/jquery/ui/jquery.ui.effect-fold.min.js', array('jquery-effects-core'), '1.10.3', 1 );
     150        $scripts->add( 'jquery-effects-highlight', '/' . WPINC . '/js/jquery/ui/jquery.ui.effect-highlight.min.js', array('jquery-effects-core'), '1.10.3', 1 );
     151        $scripts->add( 'jquery-effects-pulsate', '/' . WPINC . '/js/jquery/ui/jquery.ui.effect-pulsate.min.js', array('jquery-effects-core'), '1.10.3', 1 );
     152        $scripts->add( 'jquery-effects-scale', '/' . WPINC . '/js/jquery/ui/jquery.ui.effect-scale.min.js', array('jquery-effects-core'), '1.10.3', 1 );
     153        $scripts->add( 'jquery-effects-shake', '/' . WPINC . '/js/jquery/ui/jquery.ui.effect-shake.min.js', array('jquery-effects-core'), '1.10.3', 1 );
     154        $scripts->add( 'jquery-effects-slide', '/' . WPINC . '/js/jquery/ui/jquery.ui.effect-slide.min.js', array('jquery-effects-core'), '1.10.3', 1 );
     155        $scripts->add( 'jquery-effects-transfer', '/' . WPINC . '/js/jquery/ui/jquery.ui.effect-transfer.min.js', array('jquery-effects-core'), '1.10.3', 1 );
    156156
    157         $scripts->add( 'jquery-ui-accordion', '/wp-includes/js/jquery/ui/jquery.ui.accordion.min.js', array('jquery-ui-core', 'jquery-ui-widget'), '1.10.3', 1 );
    158         $scripts->add( 'jquery-ui-autocomplete', '/wp-includes/js/jquery/ui/jquery.ui.autocomplete.min.js', array('jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position', 'jquery-ui-menu'), '1.10.3', 1 );
    159         $scripts->add( 'jquery-ui-button', '/wp-includes/js/jquery/ui/jquery.ui.button.min.js', array('jquery-ui-core', 'jquery-ui-widget'), '1.10.3', 1 );
    160         $scripts->add( 'jquery-ui-datepicker', '/wp-includes/js/jquery/ui/jquery.ui.datepicker.min.js', array('jquery-ui-core'), '1.10.3', 1 );
    161         $scripts->add( 'jquery-ui-dialog', '/wp-includes/js/jquery/ui/jquery.ui.dialog.min.js', array('jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button', 'jquery-ui-position'), '1.10.3', 1 );
    162         $scripts->add( 'jquery-ui-draggable', '/wp-includes/js/jquery/ui/jquery.ui.draggable.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.10.3', 1 );
    163         $scripts->add( 'jquery-ui-droppable', '/wp-includes/js/jquery/ui/jquery.ui.droppable.min.js', array('jquery-ui-draggable'), '1.10.3', 1 );
    164         $scripts->add( 'jquery-ui-menu', '/wp-includes/js/jquery/ui/jquery.ui.menu.min.js', array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.10.3', 1 );
    165         $scripts->add( 'jquery-ui-mouse', '/wp-includes/js/jquery/ui/jquery.ui.mouse.min.js', array('jquery-ui-widget'), '1.10.3', 1 );
    166         $scripts->add( 'jquery-ui-position', '/wp-includes/js/jquery/ui/jquery.ui.position.min.js', array('jquery'), '1.10.3', 1 );
    167         $scripts->add( 'jquery-ui-progressbar', '/wp-includes/js/jquery/ui/jquery.ui.progressbar.min.js', array('jquery-ui-widget'), '1.10.3', 1 );
    168         $scripts->add( 'jquery-ui-resizable', '/wp-includes/js/jquery/ui/jquery.ui.resizable.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.10.3', 1 );
    169         $scripts->add( 'jquery-ui-selectable', '/wp-includes/js/jquery/ui/jquery.ui.selectable.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.10.3', 1 );
    170         $scripts->add( 'jquery-ui-slider', '/wp-includes/js/jquery/ui/jquery.ui.slider.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.10.3', 1 );
    171         $scripts->add( 'jquery-ui-sortable', '/wp-includes/js/jquery/ui/jquery.ui.sortable.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.10.3', 1 );
    172         $scripts->add( 'jquery-ui-spinner', '/wp-includes/js/jquery/ui/jquery.ui.spinner.min.js', array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-button' ), '1.10.3', 1 );
    173         $scripts->add( 'jquery-ui-tabs', '/wp-includes/js/jquery/ui/jquery.ui.tabs.min.js', array('jquery-ui-core', 'jquery-ui-widget'), '1.10.3', 1 );
    174         $scripts->add( 'jquery-ui-tooltip', '/wp-includes/js/jquery/ui/jquery.ui.tooltip.min.js', array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.10.3', 1 );
    175         $scripts->add( 'jquery-ui-widget', '/wp-includes/js/jquery/ui/jquery.ui.widget.min.js', array('jquery'), '1.10.3', 1 );
     157        $scripts->add( 'jquery-ui-accordion', '/' . WPINC . '/js/jquery/ui/jquery.ui.accordion.min.js', array('jquery-ui-core', 'jquery-ui-widget'), '1.10.3', 1 );
     158        $scripts->add( 'jquery-ui-autocomplete', '/' . WPINC . '/js/jquery/ui/jquery.ui.autocomplete.min.js', array('jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position', 'jquery-ui-menu'), '1.10.3', 1 );
     159        $scripts->add( 'jquery-ui-button', '/' . WPINC . '/js/jquery/ui/jquery.ui.button.min.js', array('jquery-ui-core', 'jquery-ui-widget'), '1.10.3', 1 );
     160        $scripts->add( 'jquery-ui-datepicker', '/' . WPINC . '/js/jquery/ui/jquery.ui.datepicker.min.js', array('jquery-ui-core'), '1.10.3', 1 );
     161        $scripts->add( 'jquery-ui-dialog', '/' . WPINC . '/js/jquery/ui/jquery.ui.dialog.min.js', array('jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button', 'jquery-ui-position'), '1.10.3', 1 );
     162        $scripts->add( 'jquery-ui-draggable', '/' . WPINC . '/js/jquery/ui/jquery.ui.draggable.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.10.3', 1 );
     163        $scripts->add( 'jquery-ui-droppable', '/' . WPINC . '/js/jquery/ui/jquery.ui.droppable.min.js', array('jquery-ui-draggable'), '1.10.3', 1 );
     164        $scripts->add( 'jquery-ui-menu', '/' . WPINC . '/js/jquery/ui/jquery.ui.menu.min.js', array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.10.3', 1 );
     165        $scripts->add( 'jquery-ui-mouse', '/' . WPINC . '/js/jquery/ui/jquery.ui.mouse.min.js', array('jquery-ui-widget'), '1.10.3', 1 );
     166        $scripts->add( 'jquery-ui-position', '/' . WPINC . '/js/jquery/ui/jquery.ui.position.min.js', array('jquery'), '1.10.3', 1 );
     167        $scripts->add( 'jquery-ui-progressbar', '/' . WPINC . '/js/jquery/ui/jquery.ui.progressbar.min.js', array('jquery-ui-widget'), '1.10.3', 1 );
     168        $scripts->add( 'jquery-ui-resizable', '/' . WPINC . '/js/jquery/ui/jquery.ui.resizable.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.10.3', 1 );
     169        $scripts->add( 'jquery-ui-selectable', '/' . WPINC . '/js/jquery/ui/jquery.ui.selectable.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.10.3', 1 );
     170        $scripts->add( 'jquery-ui-slider', '/' . WPINC . '/js/jquery/ui/jquery.ui.slider.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.10.3', 1 );
     171        $scripts->add( 'jquery-ui-sortable', '/' . WPINC . '/js/jquery/ui/jquery.ui.sortable.min.js', array('jquery-ui-core', 'jquery-ui-mouse'), '1.10.3', 1 );
     172        $scripts->add( 'jquery-ui-spinner', '/' . WPINC . '/js/jquery/ui/jquery.ui.spinner.min.js', array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-button' ), '1.10.3', 1 );
     173        $scripts->add( 'jquery-ui-tabs', '/' . WPINC . '/js/jquery/ui/jquery.ui.tabs.min.js', array('jquery-ui-core', 'jquery-ui-widget'), '1.10.3', 1 );
     174        $scripts->add( 'jquery-ui-tooltip', '/' . WPINC . '/js/jquery/ui/jquery.ui.tooltip.min.js', array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.10.3', 1 );
     175        $scripts->add( 'jquery-ui-widget', '/' . WPINC . '/js/jquery/ui/jquery.ui.widget.min.js', array('jquery'), '1.10.3', 1 );
    176176
    177177        // deprecated, not used in core, most functionality is included in jQuery 1.3
    178         $scripts->add( 'jquery-form', "/wp-includes/js/jquery/jquery.form$suffix.js", array('jquery'), '2.73', 1 );
     178        $scripts->add( 'jquery-form', "/" . WPINC . "/js/jquery/jquery.form$suffix.js", array('jquery'), '2.73', 1 );
    179179
    180180        // jQuery plugins
    181         $scripts->add( 'jquery-color', "/wp-includes/js/jquery/jquery.color.min.js", array('jquery'), '2.1.1', 1 );
    182         $scripts->add( 'suggest', "/wp-includes/js/jquery/suggest$suffix.js", array('jquery'), '1.1-20110113', 1 );
    183         $scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20m', 1 );
    184         $scripts->add( 'jquery-query', "/wp-includes/js/jquery/jquery.query.js", array('jquery'), '2.1.7', 1 );
    185         $scripts->add( 'jquery-serialize-object', "/wp-includes/js/jquery/jquery.serialize-object.js", array('jquery'), '0.2', 1 );
    186         $scripts->add( 'jquery-hotkeys', "/wp-includes/js/jquery/jquery.hotkeys$suffix.js", array('jquery'), '0.0.2m', 1 );
    187         $scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), false, 1 );
    188         $scripts->add( 'jquery-touch-punch', "/wp-includes/js/jquery/jquery.ui.touch-punch.js", array('jquery-ui-widget', 'jquery-ui-mouse'), '0.2.2', 1 );
    189         $scripts->add( 'jquery-masonry', "/wp-includes/js/jquery/jquery.masonry.min.js", array('jquery'), '2.1.05', 1 );
     181        $scripts->add( 'jquery-color', "/" . WPINC . "/js/jquery/jquery.color.min.js", array('jquery'), '2.1.1', 1 );
     182        $scripts->add( 'suggest', "/" . WPINC . "/js/jquery/suggest$suffix.js", array('jquery'), '1.1-20110113', 1 );
     183        $scripts->add( 'schedule', '/' . WPINC . '/js/jquery/jquery.schedule.js', array('jquery'), '20m', 1 );
     184        $scripts->add( 'jquery-query', "/" . WPINC . "/js/jquery/jquery.query.js", array('jquery'), '2.1.7', 1 );
     185        $scripts->add( 'jquery-serialize-object', "/" . WPINC . "/js/jquery/jquery.serialize-object.js", array('jquery'), '0.2', 1 );
     186        $scripts->add( 'jquery-hotkeys', "/" . WPINC . "/js/jquery/jquery.hotkeys$suffix.js", array('jquery'), '0.0.2m', 1 );
     187        $scripts->add( 'jquery-table-hotkeys', "/" . WPINC . "/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), false, 1 );
     188        $scripts->add( 'jquery-touch-punch', "/" . WPINC . "/js/jquery/jquery.ui.touch-punch.js", array('jquery-ui-widget', 'jquery-ui-mouse'), '0.2.2', 1 );
     189        $scripts->add( 'jquery-masonry', "/" . WPINC . "/js/jquery/jquery.masonry.min.js", array('jquery'), '2.1.05', 1 );
    190190
    191         $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20121105', 1 );
     191        $scripts->add( 'thickbox', "/" . WPINC . "/js/thickbox/thickbox.js", array('jquery'), '3.1-20121105', 1 );
    192192        did_action( 'init' ) && $scripts->localize( 'thickbox', 'thickboxL10n', array(
    193193                        'next' => __('Next &gt;'),
    194194                        'prev' => __('&lt; Prev'),
     
    200200                        'closeImage' => includes_url('js/thickbox/tb-close.png')
    201201        ) );
    202202
    203         $scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop.min.js", array('jquery'), '0.9.10');
     203        $scripts->add( 'jcrop', "/" . WPINC . "/js/jcrop/jquery.Jcrop.min.js", array('jquery'), '0.9.10');
    204204
    205         $scripts->add( 'swfobject', "/wp-includes/js/swfobject.js", array(), '2.2-20120417');
     205        $scripts->add( 'swfobject', "/" . WPINC . "/js/swfobject.js", array(), '2.2-20120417');
    206206
    207207        // common bits for both uploaders
    208208        $max_upload_size = ( (int) ( $max_up = @ini_get('upload_max_filesize') ) < (int) ( $max_post = @ini_get('post_max_size') ) ) ? $max_up : $max_post;
     
    236236                'error_uploading' => __('&#8220;%s&#8221; has failed to upload.')
    237237        );
    238238
    239         $scripts->add( 'plupload', '/wp-includes/js/plupload/plupload.js', array(), '1.5.7' );
    240         $scripts->add( 'plupload-html5', '/wp-includes/js/plupload/plupload.html5.js', array('plupload'), '1.5.7' );
    241         $scripts->add( 'plupload-flash', '/wp-includes/js/plupload/plupload.flash.js', array('plupload'), '1.5.7' );
    242         $scripts->add( 'plupload-silverlight', '/wp-includes/js/plupload/plupload.silverlight.js', array('plupload'), '1.5.7' );
    243         $scripts->add( 'plupload-html4', '/wp-includes/js/plupload/plupload.html4.js', array('plupload'), '1.5.7' );
     239        $scripts->add( 'plupload', '/' . WPINC . '/js/plupload/plupload.js', array(), '1.5.7' );
     240        $scripts->add( 'plupload-html5', '/' . WPINC . '/js/plupload/plupload.html5.js', array('plupload'), '1.5.7' );
     241        $scripts->add( 'plupload-flash', '/' . WPINC . '/js/plupload/plupload.flash.js', array('plupload'), '1.5.7' );
     242        $scripts->add( 'plupload-silverlight', '/' . WPINC . '/js/plupload/plupload.silverlight.js', array('plupload'), '1.5.7' );
     243        $scripts->add( 'plupload-html4', '/' . WPINC . '/js/plupload/plupload.html4.js', array('plupload'), '1.5.7' );
    244244
    245245        // cannot use the plupload.full.js, as it loads browserplus init JS from Yahoo
    246246        $scripts->add( 'plupload-all', false, array('plupload', 'plupload-html5', 'plupload-flash', 'plupload-silverlight', 'plupload-html4'), '1.5.7' );
    247247
    248         $scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload-all', 'jquery') );
     248        $scripts->add( 'plupload-handlers', "/" . WPINC . "/js/plupload/handlers$suffix.js", array('plupload-all', 'jquery') );
    249249        did_action( 'init' ) && $scripts->localize( 'plupload-handlers', 'pluploadL10n', $uploader_l10n );
    250250
    251         $scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array('plupload-all', 'jquery', 'json2', 'media-models'), false, 1 );
     251        $scripts->add( 'wp-plupload', "/" . WPINC . "/js/plupload/wp-plupload$suffix.js", array('plupload-all', 'jquery', 'json2', 'media-models'), false, 1 );
    252252        did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n );
    253253
    254254        // keep 'swfupload' for back-compat.
    255         $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113');
    256         $scripts->add( 'swfupload-swfobject', '/wp-includes/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload', 'swfobject'), '2201a');
    257         $scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2201');
    258         $scripts->add( 'swfupload-speed', '/wp-includes/js/swfupload/plugins/swfupload.speed.js', array('swfupload'), '2201');
     255        $scripts->add( 'swfupload', '/' . WPINC . '/js/swfupload/swfupload.js', array(), '2201-20110113');
     256        $scripts->add( 'swfupload-swfobject', '/' . WPINC . '/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload', 'swfobject'), '2201a');
     257        $scripts->add( 'swfupload-queue', '/' . WPINC . '/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2201');
     258        $scripts->add( 'swfupload-speed', '/' . WPINC . '/js/swfupload/plugins/swfupload.speed.js', array('swfupload'), '2201');
    259259
    260260        if ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) {
    261261                // queue all SWFUpload scripts that are used by default
    262262                $scripts->add( 'swfupload-all', false, array('swfupload', 'swfupload-swfobject', 'swfupload-queue'), '2201');
    263263        } else {
    264                 $scripts->add( 'swfupload-all', '/wp-includes/js/swfupload/swfupload-all.js', array(), '2201a');
     264                $scripts->add( 'swfupload-all', '/' . WPINC . '/js/swfupload/swfupload-all.js', array(), '2201a');
    265265        }
    266266
    267         $scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20110524');
     267        $scripts->add( 'swfupload-handlers', "/" . WPINC . "/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20110524');
    268268        did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n );
    269269
    270         $scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js" );
     270        $scripts->add( 'comment-reply', "/" . WPINC . "/js/comment-reply$suffix.js" );
    271271
    272         $scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2011-02-23');
     272        $scripts->add( 'json2', "/" . WPINC . "/js/json2$suffix.js", array(), '2011-02-23');
    273273
    274         $scripts->add( 'underscore', '/wp-includes/js/underscore.min.js', array(), '1.4.4', 1 );
    275         $scripts->add( 'template', "/wp-includes/js/template$suffix.js", array('underscore'), '1.4.4', 1 );
    276         $scripts->add( 'backbone', '/wp-includes/js/backbone.min.js', array('underscore','jquery', 'template'), '1.0.0', 1 );
     274        $scripts->add( 'underscore', '/' . WPINC . '/js/underscore.min.js', array(), '1.4.4', 1 );
     275        $scripts->add( 'template', "/" . WPINC . "/js/template$suffix.js", array('underscore'), '1.4.4', 1 );
     276        $scripts->add( 'backbone', '/' . WPINC . '/js/backbone.min.js', array('underscore','jquery', 'template'), '1.0.0', 1 );
    277277
    278278        $scripts->add( 'revisions', "/wp-admin/js/revisions$suffix.js", array( 'backbone', 'jquery-ui-slider', 'jquery-ui-tooltip' ), false, 1 );
    279279
    280         $scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), '0.9.8', 1 );
     280        $scripts->add( 'imgareaselect', "/" . WPINC . "/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), '0.9.8', 1 );
    281281
    282         $scripts->add( 'mediaelement', "/wp-includes/js/mediaelement/mediaelement-and-player.js", array('jquery'), '2.11.3', 1 );
    283         $scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement.js", array('mediaelement'), false, 1 );
     282        $scripts->add( 'mediaelement', "/" . WPINC . "/js/mediaelement/mediaelement-and-player.js", array('jquery'), '2.11.3', 1 );
     283        $scripts->add( 'wp-mediaelement', "/" . WPINC . "/js/mediaelement/wp-mediaelement.js", array('mediaelement'), false, 1 );
    284284
    285285        $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), false, 1 );
    286286        did_action( 'init' ) && $scripts->localize( 'password-strength-meter', 'pwsL10n', array(
     
    297297
    298298        $scripts->add( 'user-suggest', "/wp-admin/js/user-suggest$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );
    299299
    300         $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", array(), false, 1 );
     300        $scripts->add( 'admin-bar', "/" . WPINC . "/js/admin-bar$suffix.js", array(), false, 1 );
    301301
    302         $scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery', 'wpdialogs' ), false, 1 );
     302        $scripts->add( 'wplink', "/" . WPINC . "/js/wplink$suffix.js", array( 'jquery', 'wpdialogs' ), false, 1 );
    303303        did_action( 'init' ) && $scripts->localize( 'wplink', 'wpLinkL10n', array(
    304304                'title' => __('Insert/edit link'),
    305305                'update' => __('Update'),
     
    308308                'noMatchesFound' => __('No matches found.')
    309309        ) );
    310310
    311         $scripts->add( 'wpdialogs', "/wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog$suffix.js", array( 'jquery-ui-dialog' ), false, 1 );
     311        $scripts->add( 'wpdialogs', "/" . WPINC . "/js/tinymce/plugins/wpdialogs/js/wpdialog$suffix.js", array( 'jquery-ui-dialog' ), false, 1 );
    312312
    313         $scripts->add( 'wpdialogs-popup', "/wp-includes/js/tinymce/plugins/wpdialogs/js/popup$suffix.js", array( 'wpdialogs' ), false, 1 );
     313        $scripts->add( 'wpdialogs-popup', "/" . WPINC . "/js/tinymce/plugins/wpdialogs/js/popup$suffix.js", array( 'wpdialogs' ), false, 1 );
    314314
    315315        $scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array( 'jquery' ), false, 1 );
    316316        did_action( 'init' ) && $scripts->localize( 'word-count', 'wordCountL10n', array(
     
    321321
    322322        $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox', 'shortcode' ), false, 1 );
    323323
    324         $scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), 'r7', 1 );
     324        $scripts->add( 'hoverIntent', "/" . WPINC . "/js/hoverIntent$suffix.js", array('jquery'), 'r7', 1 );
    325325
    326         $scripts->add( 'customize-base',     "/wp-includes/js/customize-base$suffix.js",     array( 'jquery', 'json2' ), false, 1 );
    327         $scripts->add( 'customize-loader',   "/wp-includes/js/customize-loader$suffix.js",   array( 'customize-base' ), false, 1 );
    328         $scripts->add( 'customize-preview',  "/wp-includes/js/customize-preview$suffix.js",  array( 'customize-base' ), false, 1 );
     326        $scripts->add( 'customize-base',     "/" . WPINC . "/js/customize-base$suffix.js",     array( 'jquery', 'json2' ), false, 1 );
     327        $scripts->add( 'customize-loader',   "/" . WPINC . "/js/customize-loader$suffix.js",   array( 'customize-base' ), false, 1 );
     328        $scripts->add( 'customize-preview',  "/" . WPINC . "/js/customize-preview$suffix.js",  array( 'customize-base' ), false, 1 );
    329329        $scripts->add( 'customize-controls', "/wp-admin/js/customize-controls$suffix.js", array( 'customize-base' ), false, 1 );
    330330        did_action( 'init' ) && $scripts->localize( 'customize-controls', '_wpCustomizeControlsL10n', array(
    331331                'activate'  => __( 'Save &amp; Activate' ),
     
    341341
    342342        $scripts->add( 'accordion', "/wp-admin/js/accordion$suffix.js", array( 'jquery' ), false, 1 );
    343343
    344         $scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 );
    345         $scripts->add( 'media-models', "/wp-includes/js/media-models$suffix.js", array( 'backbone', 'jquery' ), false, 1 );
     344        $scripts->add( 'shortcode', "/" . WPINC . "/js/shortcode$suffix.js", array( 'underscore' ), false, 1 );
     345        $scripts->add( 'media-models', "/" . WPINC . "/js/media-models$suffix.js", array( 'backbone', 'jquery' ), false, 1 );
    346346        did_action( 'init' ) && $scripts->localize( 'media-models', '_wpMediaModelsL10n', array(
    347347                'settings' => array(
    348348                        'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ),
     
    352352
    353353        // To enqueue media-views or media-editor, call wp_enqueue_media().
    354354        // Both rely on numerous settings, styles, and templates to operate correctly.
    355         $scripts->add( 'media-views',  "/wp-includes/js/media-views$suffix.js",  array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable' ), false, 1 );
    356         $scripts->add( 'media-editor', "/wp-includes/js/media-editor$suffix.js", array( 'shortcode', 'media-views' ), false, 1 );
    357         $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models' ), false, 1 );
     355        $scripts->add( 'media-views',  "/" . WPINC . "/js/media-views$suffix.js",  array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable' ), false, 1 );
     356        $scripts->add( 'media-editor', "/" . WPINC . "/js/media-editor$suffix.js", array( 'shortcode', 'media-views' ), false, 1 );
     357        $scripts->add( 'mce-view', "/" . WPINC . "/js/mce-view$suffix.js", array( 'shortcode', 'media-models' ), false, 1 );
    358358
    359359        if ( is_admin() ) {
    360360                $scripts->add( 'ajaxcat', "/wp-admin/js/cat$suffix.js", array( 'wp-lists' ) );
     
    458458
    459459                $scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox' ), false, 1 );
    460460
    461                 $scripts->add( 'list-revisions', "/wp-includes/js/wp-list-revisions$suffix.js" );
     461                $scripts->add( 'list-revisions', "/" . WPINC . "/js/wp-list-revisions$suffix.js" );
    462462
    463463                $scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery-ui-draggable' ), false, 1 );
    464464
     
    513513        $styles->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : '';
    514514        $styles->default_version = get_bloginfo( 'version' );
    515515        $styles->text_direction = function_exists( 'is_rtl' ) && is_rtl() ? 'rtl' : 'ltr';
    516         $styles->default_dirs = array('/wp-admin/', '/wp-includes/css/');
     516        $styles->default_dirs = array('/wp-admin/', '/' . WPINC . '/css/');
    517517
    518518        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
    519519
     
    535535
    536536        $styles->add( 'media', "/wp-admin/css/media$suffix.css" );
    537537        $styles->add( 'install', "/wp-admin/css/install$suffix.css", array('buttons') );
    538         $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20121105' );
     538        $styles->add( 'thickbox', '/' . WPINC . '/js/thickbox/thickbox.css', array(), '20121105' );
    539539        $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' );
    540540        $styles->add( 'wp-color-picker', "/wp-admin/css/color-picker$suffix.css" );
    541         $styles->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop.min.css", array(), '0.9.10' );
    542         $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8' );
    543         $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css" );
    544         $styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css" );
    545         $styles->add( 'editor-buttons', "/wp-includes/css/editor$suffix.css" );
    546         $styles->add( 'wp-pointer', "/wp-includes/css/wp-pointer$suffix.css" );
     541        $styles->add( 'jcrop', "/" . WPINC . "/js/jcrop/jquery.Jcrop.min.css", array(), '0.9.10' );
     542        $styles->add( 'imgareaselect', '/' . WPINC . '/js/imgareaselect/imgareaselect.css', array(), '0.9.8' );
     543        $styles->add( 'admin-bar', "/" . WPINC . "/css/admin-bar$suffix.css" );
     544        $styles->add( 'wp-jquery-ui-dialog', "/" . WPINC . "/css/jquery-ui-dialog$suffix.css" );
     545        $styles->add( 'editor-buttons', "/" . WPINC . "/css/editor$suffix.css" );
     546        $styles->add( 'wp-pointer', "/" . WPINC . "/css/wp-pointer$suffix.css" );
    547547        $styles->add( 'customize-controls', "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie' ) );
    548         $styles->add( 'media-views', "/wp-includes/css/media-views$suffix.css", array( 'buttons' ) );
    549         $styles->add( 'buttons', "/wp-includes/css/buttons$suffix.css" );
    550         $styles->add( 'wp-auth-check', "/wp-includes/css/wp-auth-check$suffix.css" );
     548        $styles->add( 'media-views', "/" . WPINC . "/css/media-views$suffix.css", array( 'buttons' ) );
     549        $styles->add( 'buttons', "/" . WPINC . "/css/buttons$suffix.css" );
     550        $styles->add( 'wp-auth-check', "/" . WPINC . "/css/wp-auth-check$suffix.css" );
    551551
    552         $styles->add( 'mediaelement', "/wp-includes/js/mediaelement/mediaelementplayer.css" );
    553         $styles->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement.css", array( 'mediaelement' ) );
     552        $styles->add( 'mediaelement', "/" . WPINC . "/js/mediaelement/mediaelementplayer.css" );
     553        $styles->add( 'wp-mediaelement', "/" . WPINC . "/js/mediaelement/wp-mediaelement.css", array( 'mediaelement' ) );
    554554
    555555        foreach ( $rtl_styles as $rtl_style ) {
    556556                $styles->add_data( $rtl_style, 'rtl', true );
  • wp-login.php

     
    408408
    409409case 'postpass' :
    410410        if ( empty( $wp_hasher ) ) {
    411                 require_once( ABSPATH . 'wp-includes/class-phpass.php' );
     411                require_once( ABSPATH . WPINC . '/class-phpass.php' );
    412412                // By default, use the portable hash from phpass
    413413                $wp_hasher = new PasswordHash(8, true);
    414414        }