From bcf57a1219e57d79c79be037402014b5235e8bc9 Mon Sep 17 00:00:00 2001 From: Nathan Haug Date: Mon, 11 Apr 2011 13:16:57 -0700 Subject: [PATCH 1/4] Issue #22336 by quicksketch, scor, boombatower, and rfay. Move all core Drupal files under a core subdirectory. --- CHANGELOG.txt => core/CHANGELOG.txt | 0 COPYRIGHT.txt => core/COPYRIGHT.txt | 0 INSTALL.mysql.txt => core/INSTALL.mysql.txt | 0 INSTALL.pgsql.txt => core/INSTALL.pgsql.txt | 0 INSTALL.sqlite.txt => core/INSTALL.sqlite.txt | 0 INSTALL.txt => core/INSTALL.txt | 0 LICENSE.txt => core/LICENSE.txt | 0 MAINTAINERS.txt => core/MAINTAINERS.txt | 0 UPGRADE.txt => core/UPGRADE.txt | 0 authorize.php => core/authorize.php | 0 cron.php => core/cron.php | 0 {includes => core/includes}/actions.inc | 0 {includes => core/includes}/ajax.inc | 0 {includes => core/includes}/archiver.inc | 0 {includes => core/includes}/authorize.inc | 0 {includes => core/includes}/batch.inc | 0 {includes => core/includes}/batch.queue.inc | 0 {includes => core/includes}/bootstrap.inc | 0 {includes => core/includes}/cache-install.inc | 0 {includes => core/includes}/cache.inc | 0 {includes => core/includes}/common.inc | 0 {includes => core/includes}/database/database.inc | 0 {includes => core/includes}/database/log.inc | 0 .../includes}/database/mysql/database.inc | 0 .../includes}/database/mysql/install.inc | 0 .../includes}/database/mysql/query.inc | 0 .../includes}/database/mysql/schema.inc | 0 .../includes}/database/pgsql/database.inc | 0 .../includes}/database/pgsql/install.inc | 0 .../includes}/database/pgsql/query.inc | 0 .../includes}/database/pgsql/schema.inc | 0 .../includes}/database/pgsql/select.inc | 0 {includes => core/includes}/database/prefetch.inc | 0 {includes => core/includes}/database/query.inc | 0 {includes => core/includes}/database/schema.inc | 0 {includes => core/includes}/database/select.inc | 0 .../includes}/database/sqlite/database.inc | 0 .../includes}/database/sqlite/install.inc | 0 .../includes}/database/sqlite/query.inc | 0 .../includes}/database/sqlite/schema.inc | 0 .../includes}/database/sqlite/select.inc | 0 {includes => core/includes}/date.inc | 0 {includes => core/includes}/entity.inc | 0 {includes => core/includes}/errors.inc | 0 {includes => core/includes}/file.inc | 0 {includes => core/includes}/file.mimetypes.inc | 0 .../includes}/filetransfer/filetransfer.inc | 0 {includes => core/includes}/filetransfer/ftp.inc | 0 {includes => core/includes}/filetransfer/local.inc | 0 {includes => core/includes}/filetransfer/ssh.inc | 0 {includes => core/includes}/form.inc | 0 {includes => core/includes}/graph.inc | 0 {includes => core/includes}/image.inc | 0 {includes => core/includes}/install.core.inc | 0 {includes => core/includes}/install.inc | 0 {includes => core/includes}/iso.inc | 0 {includes => core/includes}/language.inc | 0 {includes => core/includes}/locale.inc | 0 {includes => core/includes}/lock.inc | 0 {includes => core/includes}/mail.inc | 0 {includes => core/includes}/menu.inc | 0 {includes => core/includes}/module.inc | 0 {includes => core/includes}/pager.inc | 0 {includes => core/includes}/password.inc | 0 {includes => core/includes}/path.inc | 0 {includes => core/includes}/registry.inc | 0 {includes => core/includes}/session.inc | 0 {includes => core/includes}/stream_wrappers.inc | 0 {includes => core/includes}/tablesort.inc | 0 {includes => core/includes}/theme.inc | 0 {includes => core/includes}/theme.maintenance.inc | 0 {includes => core/includes}/token.inc | 0 {includes => core/includes}/unicode.entities.inc | 0 {includes => core/includes}/unicode.inc | 0 {includes => core/includes}/update.inc | 0 {includes => core/includes}/updater.inc | 0 {includes => core/includes}/utility.inc | 0 {includes => core/includes}/xmlrpc.inc | 0 {includes => core/includes}/xmlrpcs.inc | 0 install.php => core/install.php | 0 {misc => core/misc}/ajax.js | 0 {misc => core/misc}/arrow-asc.png | Bin 118 -> 118 bytes {misc => core/misc}/arrow-desc.png | Bin 118 -> 118 bytes {misc => core/misc}/authorize.js | 0 {misc => core/misc}/autocomplete.js | 0 {misc => core/misc}/batch.js | 0 {misc => core/misc}/collapse.js | 0 {misc => core/misc}/configure.png | Bin 248 -> 248 bytes {misc => core/misc}/draggable.png | Bin 268 -> 268 bytes {misc => core/misc}/drupal.js | 0 {misc => core/misc}/druplicon.png | Bin 3905 -> 3905 bytes {misc => core/misc}/farbtastic/farbtastic.css | 0 {misc => core/misc}/farbtastic/farbtastic.js | 0 {misc => core/misc}/farbtastic/marker.png | Bin 437 -> 437 bytes {misc => core/misc}/farbtastic/mask.png | Bin 2001 -> 2001 bytes {misc => core/misc}/farbtastic/wheel.png | Bin 11589 -> 11589 bytes {misc => core/misc}/favicon.ico | Bin 5430 -> 5430 bytes {misc => core/misc}/feed.png | Bin 656 -> 656 bytes {misc => core/misc}/form.js | 0 {misc => core/misc}/forum-icons.png | Bin 1765 -> 1765 bytes {misc => core/misc}/grippie.png | Bin 106 -> 106 bytes {misc => core/misc}/help.png | Bin 294 -> 294 bytes {misc => core/misc}/jquery.ba-bbq.js | 0 {misc => core/misc}/jquery.cookie.js | 0 {misc => core/misc}/jquery.form.js | 0 {misc => core/misc}/jquery.js | 0 {misc => core/misc}/jquery.once.js | 0 {misc => core/misc}/machine-name.js | 0 {misc => core/misc}/menu-collapsed-rtl.png | Bin 107 -> 107 bytes {misc => core/misc}/menu-collapsed.png | Bin 105 -> 105 bytes {misc => core/misc}/menu-expanded.png | Bin 106 -> 106 bytes {misc => core/misc}/menu-leaf.png | Bin 126 -> 126 bytes {misc => core/misc}/message-16-error.png | Bin 519 -> 519 bytes {misc => core/misc}/message-16-help.png | Bin 668 -> 668 bytes {misc => core/misc}/message-16-info.png | Bin 733 -> 733 bytes {misc => core/misc}/message-16-ok.png | Bin 639 -> 639 bytes {misc => core/misc}/message-16-warning.png | Bin 442 -> 442 bytes {misc => core/misc}/message-24-error.png | Bin 733 -> 733 bytes {misc => core/misc}/message-24-help.png | Bin 1088 -> 1088 bytes {misc => core/misc}/message-24-info.png | Bin 1011 -> 1011 bytes {misc => core/misc}/message-24-ok.png | Bin 1058 -> 1058 bytes {misc => core/misc}/message-24-warning.png | Bin 753 -> 753 bytes {misc => core/misc}/permissions.png | Bin 242 -> 242 bytes {misc => core/misc}/powered-black-135x42.png | Bin 2699 -> 2699 bytes {misc => core/misc}/powered-black-80x15.png | Bin 1448 -> 1448 bytes {misc => core/misc}/powered-black-88x31.png | Bin 2005 -> 2005 bytes {misc => core/misc}/powered-blue-135x42.png | Bin 2879 -> 2879 bytes {misc => core/misc}/powered-blue-80x15.png | Bin 943 -> 943 bytes {misc => core/misc}/powered-blue-88x31.png | Bin 2009 -> 2009 bytes {misc => core/misc}/powered-gray-135x42.png | Bin 2594 -> 2594 bytes {misc => core/misc}/powered-gray-80x15.png | Bin 698 -> 698 bytes {misc => core/misc}/powered-gray-88x31.png | Bin 1968 -> 1968 bytes {misc => core/misc}/print-rtl.css | 0 {misc => core/misc}/print.css | 0 {misc => core/misc}/progress.gif | Bin 5872 -> 5872 bytes {misc => core/misc}/progress.js | 0 {misc => core/misc}/states.js | 0 {misc => core/misc}/tabledrag.js | 0 {misc => core/misc}/tableheader.js | 0 {misc => core/misc}/tableselect.js | 0 {misc => core/misc}/textarea.js | 0 {misc => core/misc}/throbber.gif | Bin 1336 -> 1336 bytes {misc => core/misc}/timezone.js | 0 {misc => core/misc}/tree-bottom.png | Bin 129 -> 129 bytes {misc => core/misc}/tree.png | Bin 130 -> 130 bytes .../misc}/ui/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 180 -> 180 bytes .../ui/images/ui-bg_flat_75_ffffff_40x100.png | Bin 178 -> 178 bytes .../ui/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 120 -> 120 bytes .../ui/images/ui-bg_glass_65_ffffff_1x400.png | Bin 105 -> 105 bytes .../ui/images/ui-bg_glass_75_dadada_1x400.png | Bin 111 -> 111 bytes .../ui/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 110 -> 110 bytes .../ui/images/ui-bg_glass_95_fef1ec_1x400.png | Bin 119 -> 119 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 101 -> 101 bytes .../misc}/ui/images/ui-icons_222222_256x240.png | Bin 4369 -> 4369 bytes .../misc}/ui/images/ui-icons_2e83ff_256x240.png | Bin 4369 -> 4369 bytes .../misc}/ui/images/ui-icons_454545_256x240.png | Bin 4369 -> 4369 bytes .../misc}/ui/images/ui-icons_888888_256x240.png | Bin 4369 -> 4369 bytes .../misc}/ui/images/ui-icons_cd0a0a_256x240.png | Bin 4369 -> 4369 bytes {misc => core/misc}/ui/jquery.effects.blind.min.js | 0 .../misc}/ui/jquery.effects.bounce.min.js | 0 {misc => core/misc}/ui/jquery.effects.clip.min.js | 0 {misc => core/misc}/ui/jquery.effects.core.min.js | 0 {misc => core/misc}/ui/jquery.effects.drop.min.js | 0 .../misc}/ui/jquery.effects.explode.min.js | 0 {misc => core/misc}/ui/jquery.effects.fade.min.js | 0 {misc => core/misc}/ui/jquery.effects.fold.min.js | 0 .../misc}/ui/jquery.effects.highlight.min.js | 0 .../misc}/ui/jquery.effects.pulsate.min.js | 0 {misc => core/misc}/ui/jquery.effects.scale.min.js | 0 {misc => core/misc}/ui/jquery.effects.shake.min.js | 0 {misc => core/misc}/ui/jquery.effects.slide.min.js | 0 .../misc}/ui/jquery.effects.transfer.min.js | 0 {misc => core/misc}/ui/jquery.ui.accordion.css | 0 {misc => core/misc}/ui/jquery.ui.accordion.min.js | 0 {misc => core/misc}/ui/jquery.ui.autocomplete.css | 0 .../misc}/ui/jquery.ui.autocomplete.min.js | 0 {misc => core/misc}/ui/jquery.ui.button.css | 0 {misc => core/misc}/ui/jquery.ui.button.min.js | 0 {misc => core/misc}/ui/jquery.ui.core.css | 0 {misc => core/misc}/ui/jquery.ui.core.min.js | 0 {misc => core/misc}/ui/jquery.ui.datepicker.css | 0 {misc => core/misc}/ui/jquery.ui.datepicker.min.js | 0 {misc => core/misc}/ui/jquery.ui.dialog.css | 0 {misc => core/misc}/ui/jquery.ui.dialog.min.js | 0 {misc => core/misc}/ui/jquery.ui.draggable.min.js | 0 {misc => core/misc}/ui/jquery.ui.droppable.min.js | 0 {misc => core/misc}/ui/jquery.ui.mouse.min.js | 0 {misc => core/misc}/ui/jquery.ui.position.min.js | 0 {misc => core/misc}/ui/jquery.ui.progressbar.css | 0 .../misc}/ui/jquery.ui.progressbar.min.js | 0 {misc => core/misc}/ui/jquery.ui.resizable.css | 0 {misc => core/misc}/ui/jquery.ui.resizable.min.js | 0 {misc => core/misc}/ui/jquery.ui.selectable.css | 0 {misc => core/misc}/ui/jquery.ui.selectable.min.js | 0 {misc => core/misc}/ui/jquery.ui.slider.css | 0 {misc => core/misc}/ui/jquery.ui.slider.min.js | 0 {misc => core/misc}/ui/jquery.ui.sortable.min.js | 0 {misc => core/misc}/ui/jquery.ui.tabs.css | 0 {misc => core/misc}/ui/jquery.ui.tabs.min.js | 0 {misc => core/misc}/ui/jquery.ui.theme.css | 0 {misc => core/misc}/ui/jquery.ui.widget.min.js | 0 {misc => core/misc}/vertical-tabs-rtl.css | 0 {misc => core/misc}/vertical-tabs.css | 0 {misc => core/misc}/vertical-tabs.js | 0 {misc => core/misc}/watchdog-error.png | Bin 780 -> 780 bytes {misc => core/misc}/watchdog-ok.png | Bin 375 -> 375 bytes {misc => core/misc}/watchdog-warning.png | Bin 318 -> 318 bytes {modules => core/modules}/README.txt | 0 .../aggregator/aggregator-feed-source.tpl.php | 0 .../modules}/aggregator/aggregator-item.tpl.php | 0 .../modules}/aggregator/aggregator-rtl.css | 0 .../aggregator/aggregator-summary-item.tpl.php | 0 .../aggregator/aggregator-summary-items.tpl.php | 0 .../modules}/aggregator/aggregator-wrapper.tpl.php | 0 .../modules}/aggregator/aggregator.admin.inc | 0 .../modules}/aggregator/aggregator.api.php | 0 .../modules}/aggregator/aggregator.css | 0 .../modules}/aggregator/aggregator.fetcher.inc | 0 .../modules}/aggregator/aggregator.info | 0 .../modules}/aggregator/aggregator.install | 0 .../modules}/aggregator/aggregator.module | 0 .../modules}/aggregator/aggregator.pages.inc | 0 .../modules}/aggregator/aggregator.parser.inc | 0 .../modules}/aggregator/aggregator.processor.inc | 0 .../modules}/aggregator/aggregator.test | 0 .../modules}/aggregator/tests/aggregator_test.info | 0 .../aggregator/tests/aggregator_test.module | 0 .../aggregator/tests/aggregator_test_atom.xml | 0 .../aggregator/tests/aggregator_test_rss091.xml | 0 .../block/block-admin-display-form.tpl.php | 0 {modules => core/modules}/block/block.admin.inc | 0 {modules => core/modules}/block/block.api.php | 0 {modules => core/modules}/block/block.css | 0 {modules => core/modules}/block/block.info | 0 {modules => core/modules}/block/block.install | 0 {modules => core/modules}/block/block.js | 0 {modules => core/modules}/block/block.module | 0 {modules => core/modules}/block/block.test | 0 {modules => core/modules}/block/block.tpl.php | 0 .../modules}/block/tests/block_test.info | 0 .../modules}/block/tests/block_test.module | 0 {modules => core/modules}/blog/blog.info | 0 {modules => core/modules}/blog/blog.install | 0 {modules => core/modules}/blog/blog.module | 0 {modules => core/modules}/blog/blog.pages.inc | 0 {modules => core/modules}/blog/blog.test | 0 .../modules}/book/book-all-books-block.tpl.php | 0 .../modules}/book/book-export-html.tpl.php | 0 .../modules}/book/book-navigation.tpl.php | 0 .../modules}/book/book-node-export-html.tpl.php | 0 {modules => core/modules}/book/book-rtl.css | 0 {modules => core/modules}/book/book.admin.inc | 0 {modules => core/modules}/book/book.css | 0 {modules => core/modules}/book/book.info | 0 {modules => core/modules}/book/book.install | 0 {modules => core/modules}/book/book.js | 0 {modules => core/modules}/book/book.module | 0 {modules => core/modules}/book/book.pages.inc | 0 {modules => core/modules}/book/book.test | 0 {modules => core/modules}/color/color-rtl.css | 0 {modules => core/modules}/color/color.css | 0 {modules => core/modules}/color/color.info | 0 {modules => core/modules}/color/color.install | 0 {modules => core/modules}/color/color.js | 0 {modules => core/modules}/color/color.module | 0 {modules => core/modules}/color/color.test | 0 .../modules}/color/images/hook-rtl.png | Bin 116 -> 116 bytes {modules => core/modules}/color/images/hook.png | Bin 116 -> 116 bytes {modules => core/modules}/color/images/lock.png | Bin 230 -> 230 bytes {modules => core/modules}/color/preview.html | 0 {modules => core/modules}/color/preview.js | 0 .../modules}/comment/comment-node-form.js | 0 {modules => core/modules}/comment/comment-rtl.css | 0 .../modules}/comment/comment-wrapper.tpl.php | 0 .../modules}/comment/comment.admin.inc | 0 {modules => core/modules}/comment/comment.api.php | 0 {modules => core/modules}/comment/comment.css | 0 {modules => core/modules}/comment/comment.info | 0 {modules => core/modules}/comment/comment.install | 0 {modules => core/modules}/comment/comment.module | 0 .../modules}/comment/comment.pages.inc | 0 {modules => core/modules}/comment/comment.test | 0 .../modules}/comment/comment.tokens.inc | 0 {modules => core/modules}/comment/comment.tpl.php | 0 .../modules}/contact/contact.admin.inc | 0 {modules => core/modules}/contact/contact.info | 0 {modules => core/modules}/contact/contact.install | 0 {modules => core/modules}/contact/contact.module | 0 .../modules}/contact/contact.pages.inc | 0 {modules => core/modules}/contact/contact.test | 0 .../modules}/contextual/contextual-rtl.css | 0 .../modules}/contextual/contextual.api.php | 0 .../modules}/contextual/contextual.css | 0 .../modules}/contextual/contextual.info | 0 {modules => core/modules}/contextual/contextual.js | 0 .../modules}/contextual/contextual.module | 0 .../modules}/contextual/images/gear-select.png | Bin 506 -> 506 bytes .../modules}/dashboard/dashboard.api.php | 0 {modules => core/modules}/dashboard/dashboard.css | 0 {modules => core/modules}/dashboard/dashboard.info | 0 .../modules}/dashboard/dashboard.install | 0 {modules => core/modules}/dashboard/dashboard.js | 0 .../modules}/dashboard/dashboard.module | 0 {modules => core/modules}/dashboard/dashboard.test | 0 {modules => core/modules}/dblog/dblog-rtl.css | 0 {modules => core/modules}/dblog/dblog.admin.inc | 0 {modules => core/modules}/dblog/dblog.css | 0 {modules => core/modules}/dblog/dblog.info | 0 {modules => core/modules}/dblog/dblog.install | 0 {modules => core/modules}/dblog/dblog.module | 0 {modules => core/modules}/dblog/dblog.test | 0 {modules => core/modules}/field/field.api.php | 0 {modules => core/modules}/field/field.attach.inc | 0 {modules => core/modules}/field/field.crud.inc | 0 {modules => core/modules}/field/field.default.inc | 0 {modules => core/modules}/field/field.form.inc | 0 {modules => core/modules}/field/field.info | 0 {modules => core/modules}/field/field.info.inc | 0 {modules => core/modules}/field/field.install | 0 {modules => core/modules}/field/field.module | 0 .../modules}/field/field.multilingual.inc | 0 .../field_sql_storage/field_sql_storage.info | 0 .../field_sql_storage/field_sql_storage.install | 0 .../field_sql_storage/field_sql_storage.module | 0 .../field_sql_storage/field_sql_storage.test | 0 .../modules}/field/modules/list/list.info | 0 .../modules}/field/modules/list/list.install | 0 .../modules}/field/modules/list/list.module | 0 .../modules}/field/modules/list/tests/list.test | 0 .../field/modules/list/tests/list_test.info | 0 .../field/modules/list/tests/list_test.module | 0 .../modules}/field/modules/number/number.info | 0 .../modules}/field/modules/number/number.install | 0 .../modules}/field/modules/number/number.module | 0 .../modules}/field/modules/number/number.test | 0 .../modules}/field/modules/options/options.api.php | 0 .../modules}/field/modules/options/options.info | 0 .../modules}/field/modules/options/options.module | 0 .../modules}/field/modules/options/options.test | 0 .../modules}/field/modules/text/text.info | 0 .../modules}/field/modules/text/text.install | 0 .../modules}/field/modules/text/text.js | 0 .../modules}/field/modules/text/text.module | 0 .../modules}/field/modules/text/text.test | 0 {modules => core/modules}/field/tests/field.test | 0 .../modules}/field/tests/field_test.entity.inc | 0 .../modules}/field/tests/field_test.field.inc | 0 .../modules}/field/tests/field_test.info | 0 .../modules}/field/tests/field_test.install | 0 .../modules}/field/tests/field_test.module | 0 .../modules}/field/tests/field_test.storage.inc | 0 .../modules}/field/theme/field-rtl.css | 0 {modules => core/modules}/field/theme/field.css | 0 .../modules}/field/theme/field.tpl.php | 0 .../modules}/field_ui/field_ui-rtl.css | 0 .../modules}/field_ui/field_ui.admin.inc | 0 .../modules}/field_ui/field_ui.api.php | 0 {modules => core/modules}/field_ui/field_ui.css | 0 {modules => core/modules}/field_ui/field_ui.info | 0 {modules => core/modules}/field_ui/field_ui.js | 0 {modules => core/modules}/field_ui/field_ui.module | 0 {modules => core/modules}/field_ui/field_ui.test | 0 {modules => core/modules}/file/file.api.php | 0 {modules => core/modules}/file/file.css | 0 {modules => core/modules}/file/file.field.inc | 0 {modules => core/modules}/file/file.info | 0 {modules => core/modules}/file/file.install | 0 {modules => core/modules}/file/file.js | 0 {modules => core/modules}/file/file.module | 0 .../file/icons/application-octet-stream.png | Bin 189 -> 189 bytes .../modules}/file/icons/application-pdf.png | Bin 346 -> 346 bytes .../file/icons/application-x-executable.png | Bin 189 -> 189 bytes .../modules}/file/icons/audio-x-generic.png | Bin 314 -> 314 bytes .../modules}/file/icons/image-x-generic.png | Bin 385 -> 385 bytes .../modules}/file/icons/package-x-generic.png | Bin 260 -> 260 bytes {modules => core/modules}/file/icons/text-html.png | Bin 265 -> 265 bytes .../modules}/file/icons/text-plain.png | Bin 220 -> 220 bytes .../modules}/file/icons/text-x-generic.png | Bin 220 -> 220 bytes .../modules}/file/icons/text-x-script.png | Bin 276 -> 276 bytes .../modules}/file/icons/video-x-generic.png | Bin 214 -> 214 bytes .../modules}/file/icons/x-office-document.png | Bin 196 -> 196 bytes .../modules}/file/icons/x-office-presentation.png | Bin 181 -> 181 bytes .../modules}/file/icons/x-office-spreadsheet.png | Bin 183 -> 183 bytes {modules => core/modules}/file/tests/file.test | 0 .../modules}/file/tests/file_module_test.info | 0 .../modules}/file/tests/file_module_test.module | 0 {modules => core/modules}/filter/filter.admin.inc | 0 {modules => core/modules}/filter/filter.admin.js | 0 {modules => core/modules}/filter/filter.api.php | 0 {modules => core/modules}/filter/filter.css | 0 {modules => core/modules}/filter/filter.info | 0 {modules => core/modules}/filter/filter.install | 0 {modules => core/modules}/filter/filter.js | 0 {modules => core/modules}/filter/filter.module | 0 {modules => core/modules}/filter/filter.pages.inc | 0 {modules => core/modules}/filter/filter.test | 0 .../modules}/filter/tests/filter.url-input.txt | 0 .../modules}/filter/tests/filter.url-output.txt | 0 {modules => core/modules}/forum/forum-icon.tpl.php | 0 {modules => core/modules}/forum/forum-list.tpl.php | 0 {modules => core/modules}/forum/forum-rtl.css | 0 .../modules}/forum/forum-submitted.tpl.php | 0 .../modules}/forum/forum-topic-list.tpl.php | 0 {modules => core/modules}/forum/forum.admin.inc | 0 {modules => core/modules}/forum/forum.css | 0 {modules => core/modules}/forum/forum.info | 0 {modules => core/modules}/forum/forum.install | 0 {modules => core/modules}/forum/forum.module | 0 {modules => core/modules}/forum/forum.pages.inc | 0 {modules => core/modules}/forum/forum.test | 0 {modules => core/modules}/forum/forums.tpl.php | 0 {modules => core/modules}/help/help-rtl.css | 0 {modules => core/modules}/help/help.admin.inc | 0 {modules => core/modules}/help/help.api.php | 0 {modules => core/modules}/help/help.css | 0 {modules => core/modules}/help/help.info | 0 {modules => core/modules}/help/help.module | 0 {modules => core/modules}/help/help.test | 0 {modules => core/modules}/image/image-rtl.css | 0 {modules => core/modules}/image/image.admin.css | 0 {modules => core/modules}/image/image.admin.inc | 0 {modules => core/modules}/image/image.api.php | 0 {modules => core/modules}/image/image.css | 0 {modules => core/modules}/image/image.effects.inc | 0 {modules => core/modules}/image/image.field.inc | 0 {modules => core/modules}/image/image.info | 0 {modules => core/modules}/image/image.install | 0 {modules => core/modules}/image/image.module | 0 {modules => core/modules}/image/image.test | 0 {modules => core/modules}/image/sample.png | Bin 168110 -> 168110 bytes .../modules}/image/tests/image_module_test.info | 0 .../modules}/image/tests/image_module_test.module | 0 {modules => core/modules}/locale/locale.admin.inc | 0 {modules => core/modules}/locale/locale.api.php | 0 {modules => core/modules}/locale/locale.css | 0 .../modules}/locale/locale.datepicker.js | 0 {modules => core/modules}/locale/locale.info | 0 {modules => core/modules}/locale/locale.install | 0 {modules => core/modules}/locale/locale.module | 0 {modules => core/modules}/locale/locale.test | 0 .../modules}/locale/tests/locale_test.info | 0 .../modules}/locale/tests/locale_test.module | 0 .../modules}/locale/tests/translations/test.xx.po | 0 {modules => core/modules}/menu/menu.admin.inc | 0 {modules => core/modules}/menu/menu.admin.js | 0 {modules => core/modules}/menu/menu.api.php | 0 {modules => core/modules}/menu/menu.css | 0 {modules => core/modules}/menu/menu.info | 0 {modules => core/modules}/menu/menu.install | 0 {modules => core/modules}/menu/menu.js | 0 {modules => core/modules}/menu/menu.module | 0 {modules => core/modules}/menu/menu.test | 0 {modules => core/modules}/node/content_types.inc | 0 {modules => core/modules}/node/content_types.js | 0 {modules => core/modules}/node/node-rtl.css | 0 {modules => core/modules}/node/node.admin.inc | 0 {modules => core/modules}/node/node.api.php | 0 {modules => core/modules}/node/node.css | 0 {modules => core/modules}/node/node.info | 0 {modules => core/modules}/node/node.install | 0 {modules => core/modules}/node/node.js | 0 {modules => core/modules}/node/node.module | 0 {modules => core/modules}/node/node.pages.inc | 0 {modules => core/modules}/node/node.test | 0 {modules => core/modules}/node/node.tokens.inc | 0 {modules => core/modules}/node/node.tpl.php | 0 .../modules}/node/tests/node_access_test.info | 0 .../modules}/node/tests/node_access_test.module | 0 .../modules}/node/tests/node_test.info | 0 .../modules}/node/tests/node_test.module | 0 .../modules}/node/tests/node_test_exception.info | 0 .../modules}/node/tests/node_test_exception.module | 0 {modules => core/modules}/openid/login-bg.png | Bin 205 -> 205 bytes {modules => core/modules}/openid/openid-rtl.css | 0 {modules => core/modules}/openid/openid.api.php | 0 {modules => core/modules}/openid/openid.css | 0 {modules => core/modules}/openid/openid.inc | 0 {modules => core/modules}/openid/openid.info | 0 {modules => core/modules}/openid/openid.install | 0 {modules => core/modules}/openid/openid.js | 0 {modules => core/modules}/openid/openid.module | 0 {modules => core/modules}/openid/openid.pages.inc | 0 {modules => core/modules}/openid/openid.test | 0 .../modules}/openid/tests/openid_test.info | 0 .../modules}/openid/tests/openid_test.install | 0 .../modules}/openid/tests/openid_test.module | 0 .../modules}/overlay/images/background.png | Bin 76 -> 76 bytes {modules => core/modules}/overlay/images/close.png | Bin 344 -> 344 bytes .../modules}/overlay/overlay-child.css | 0 {modules => core/modules}/overlay/overlay-child.js | 0 .../modules}/overlay/overlay-parent.css | 0 .../modules}/overlay/overlay-parent.js | 0 {modules => core/modules}/overlay/overlay.api.php | 0 {modules => core/modules}/overlay/overlay.info | 0 {modules => core/modules}/overlay/overlay.install | 0 {modules => core/modules}/overlay/overlay.module | 0 {modules => core/modules}/overlay/overlay.tpl.php | 0 {modules => core/modules}/path/path.admin.inc | 0 {modules => core/modules}/path/path.api.php | 0 {modules => core/modules}/path/path.info | 0 {modules => core/modules}/path/path.js | 0 {modules => core/modules}/path/path.module | 0 {modules => core/modules}/path/path.test | 0 {modules => core/modules}/php/php.info | 0 {modules => core/modules}/php/php.install | 0 {modules => core/modules}/php/php.module | 0 {modules => core/modules}/php/php.test | 0 .../modules}/poll/poll-bar--block.tpl.php | 0 {modules => core/modules}/poll/poll-bar.tpl.php | 0 .../modules}/poll/poll-results--block.tpl.php | 0 .../modules}/poll/poll-results.tpl.php | 0 {modules => core/modules}/poll/poll-rtl.css | 0 {modules => core/modules}/poll/poll-vote.tpl.php | 0 {modules => core/modules}/poll/poll.css | 0 {modules => core/modules}/poll/poll.info | 0 {modules => core/modules}/poll/poll.install | 0 {modules => core/modules}/poll/poll.module | 0 {modules => core/modules}/poll/poll.pages.inc | 0 {modules => core/modules}/poll/poll.test | 0 {modules => core/modules}/poll/poll.tokens.inc | 0 .../modules}/profile/profile-block.tpl.php | 0 .../modules}/profile/profile-listing.tpl.php | 0 .../modules}/profile/profile-wrapper.tpl.php | 0 .../modules}/profile/profile.admin.inc | 0 {modules => core/modules}/profile/profile.css | 0 {modules => core/modules}/profile/profile.info | 0 {modules => core/modules}/profile/profile.install | 0 {modules => core/modules}/profile/profile.js | 0 {modules => core/modules}/profile/profile.module | 0 .../modules}/profile/profile.pages.inc | 0 {modules => core/modules}/profile/profile.test | 0 {modules => core/modules}/rdf/rdf.api.php | 0 {modules => core/modules}/rdf/rdf.info | 0 {modules => core/modules}/rdf/rdf.install | 0 {modules => core/modules}/rdf/rdf.module | 0 {modules => core/modules}/rdf/rdf.test | 0 {modules => core/modules}/rdf/tests/rdf_test.info | 0 .../modules}/rdf/tests/rdf_test.install | 0 .../modules}/rdf/tests/rdf_test.module | 0 .../modules}/search/search-block-form.tpl.php | 0 .../modules}/search/search-result.tpl.php | 0 .../modules}/search/search-results.tpl.php | 0 {modules => core/modules}/search/search-rtl.css | 0 {modules => core/modules}/search/search.admin.inc | 0 {modules => core/modules}/search/search.api.php | 0 {modules => core/modules}/search/search.css | 0 .../modules}/search/search.extender.inc | 0 {modules => core/modules}/search/search.info | 0 {modules => core/modules}/search/search.install | 0 {modules => core/modules}/search/search.module | 0 {modules => core/modules}/search/search.pages.inc | 0 {modules => core/modules}/search/search.test | 0 .../modules}/search/tests/UnicodeTest.txt | 0 .../search/tests/search_embedded_form.info | 0 .../search/tests/search_embedded_form.module | 0 .../modules}/search/tests/search_extra_type.info | 0 .../modules}/search/tests/search_extra_type.module | 0 .../modules}/shortcut/shortcut-rtl.css | 0 .../modules}/shortcut/shortcut.admin.css | 0 .../modules}/shortcut/shortcut.admin.inc | 0 .../modules}/shortcut/shortcut.admin.js | 0 .../modules}/shortcut/shortcut.api.php | 0 {modules => core/modules}/shortcut/shortcut.css | 0 {modules => core/modules}/shortcut/shortcut.info | 0 .../modules}/shortcut/shortcut.install | 0 {modules => core/modules}/shortcut/shortcut.module | 0 {modules => core/modules}/shortcut/shortcut.png | Bin 558 -> 558 bytes {modules => core/modules}/shortcut/shortcut.test | 0 .../modules}/simpletest/drupal_web_test_case.php | 0 .../modules}/simpletest/files/README.txt | 0 .../files/css_test_files/comment_hacks.css | 0 .../css_test_files/comment_hacks.css.optimized.css | 0 .../comment_hacks.css.unoptimized.css | 0 .../files/css_test_files/css_input_with_import.css | 0 .../css_input_with_import.css.optimized.css | 0 .../css_input_with_import.css.unoptimized.css | 0 .../css_test_files/css_input_without_import.css | 0 .../css_input_without_import.css.optimized.css | 0 .../css_input_without_import.css.unoptimized.css | 0 .../simpletest/files/css_test_files/import1.css | 0 .../simpletest/files/css_test_files/import2.css | 0 .../modules}/simpletest/files/html-1.txt | 0 .../modules}/simpletest/files/html-2.html | 0 .../modules}/simpletest/files/image-1.png | Bin 39325 -> 39325 bytes .../modules}/simpletest/files/image-2.jpg | Bin 1831 -> 1831 bytes .../modules}/simpletest/files/image-test.gif | Bin 183 -> 183 bytes .../modules}/simpletest/files/image-test.jpg | Bin 1901 -> 1901 bytes .../modules}/simpletest/files/image-test.png | Bin 125 -> 125 bytes .../modules}/simpletest/files/javascript-1.txt | 0 .../modules}/simpletest/files/javascript-2.script | 0 .../modules}/simpletest/files/php-1.txt | 0 .../modules}/simpletest/files/php-2.php | 0 .../modules}/simpletest/files/sql-1.txt | 0 .../modules}/simpletest/files/sql-2.sql | 0 .../modules}/simpletest/simpletest.api.php | 0 .../modules}/simpletest/simpletest.css | 0 .../modules}/simpletest/simpletest.info | 0 .../modules}/simpletest/simpletest.install | 0 {modules => core/modules}/simpletest/simpletest.js | 0 .../modules}/simpletest/simpletest.module | 0 .../modules}/simpletest/simpletest.pages.inc | 0 .../modules}/simpletest/simpletest.test | 0 .../modules}/simpletest/tests/actions.test | 0 .../simpletest/tests/actions_loop_test.info | 0 .../simpletest/tests/actions_loop_test.install | 0 .../simpletest/tests/actions_loop_test.module | 0 .../modules}/simpletest/tests/ajax.test | 0 .../modules}/simpletest/tests/ajax_forms_test.info | 0 .../simpletest/tests/ajax_forms_test.module | 0 .../modules}/simpletest/tests/ajax_test.info | 0 .../modules}/simpletest/tests/ajax_test.module | 0 .../modules}/simpletest/tests/batch.test | 0 .../simpletest/tests/batch_test.callbacks.inc | 0 .../modules}/simpletest/tests/batch_test.info | 0 .../modules}/simpletest/tests/batch_test.module | 0 .../modules}/simpletest/tests/bootstrap.test | 0 .../modules}/simpletest/tests/cache.test | 0 .../modules}/simpletest/tests/common.test | 0 .../modules}/simpletest/tests/common_test.css | 0 .../modules}/simpletest/tests/common_test.info | 0 .../modules}/simpletest/tests/common_test.module | 0 .../simpletest/tests/common_test.print.css | 0 .../modules}/simpletest/tests/common_test_info.txt | 0 .../modules}/simpletest/tests/database_test.info | 0 .../simpletest/tests/database_test.install | 0 .../modules}/simpletest/tests/database_test.module | 0 .../modules}/simpletest/tests/database_test.test | 0 .../drupal_system_listing_compatible_test.info | 0 .../drupal_system_listing_compatible_test.module | 0 .../drupal_system_listing_incompatible_test.info | 0 .../drupal_system_listing_incompatible_test.module | 0 .../simpletest/tests/entity_cache_test.info | 0 .../simpletest/tests/entity_cache_test.module | 0 .../tests/entity_cache_test_dependency.info | 0 .../tests/entity_cache_test_dependency.module | 0 .../simpletest/tests/entity_crud_hook_test.info | 0 .../simpletest/tests/entity_crud_hook_test.module | 0 .../simpletest/tests/entity_crud_hook_test.test | 0 .../modules}/simpletest/tests/entity_query.test | 0 .../modules}/simpletest/tests/error.test | 0 .../modules}/simpletest/tests/error_test.info | 0 .../modules}/simpletest/tests/error_test.module | 0 .../modules}/simpletest/tests/file.test | 0 .../modules}/simpletest/tests/file_test.info | 0 .../modules}/simpletest/tests/file_test.module | 0 .../modules}/simpletest/tests/filetransfer.test | 0 .../modules}/simpletest/tests/filter_test.info | 0 .../modules}/simpletest/tests/filter_test.module | 0 .../modules}/simpletest/tests/form.test | 0 .../modules}/simpletest/tests/form_test.file.inc | 0 .../modules}/simpletest/tests/form_test.info | 0 .../modules}/simpletest/tests/form_test.module | 0 .../modules}/simpletest/tests/graph.test | 0 .../modules}/simpletest/tests/http.php | 0 .../modules}/simpletest/tests/https.php | 0 .../modules}/simpletest/tests/image.test | 0 .../modules}/simpletest/tests/image_test.info | 0 .../modules}/simpletest/tests/image_test.module | 0 .../modules}/simpletest/tests/lock.test | 0 .../modules}/simpletest/tests/mail.test | 0 .../modules}/simpletest/tests/menu.test | 0 .../modules}/simpletest/tests/menu_test.info | 0 .../modules}/simpletest/tests/menu_test.module | 0 .../modules}/simpletest/tests/module.test | 0 .../modules}/simpletest/tests/module_test.file.inc | 0 .../modules}/simpletest/tests/module_test.info | 0 .../modules}/simpletest/tests/module_test.install | 0 .../modules}/simpletest/tests/module_test.module | 0 .../modules}/simpletest/tests/password.test | 0 .../modules}/simpletest/tests/path.test | 0 .../modules}/simpletest/tests/registry.test | 0 .../simpletest/tests/requirements1_test.info | 0 .../simpletest/tests/requirements1_test.install | 0 .../simpletest/tests/requirements1_test.module | 0 .../simpletest/tests/requirements2_test.info | 0 .../simpletest/tests/requirements2_test.module | 0 .../modules}/simpletest/tests/schema.test | 0 .../modules}/simpletest/tests/session.test | 0 .../modules}/simpletest/tests/session_test.info | 0 .../modules}/simpletest/tests/session_test.module | 0 .../modules}/simpletest/tests/system.base.css | 0 .../simpletest/tests/system_dependencies_test.info | 0 .../tests/system_dependencies_test.module | 0 .../modules}/simpletest/tests/system_test.info | 0 .../modules}/simpletest/tests/system_test.module | 0 .../modules}/simpletest/tests/tablesort.test | 0 .../modules}/simpletest/tests/taxonomy_test.info | 0 .../simpletest/tests/taxonomy_test.install | 0 .../modules}/simpletest/tests/taxonomy_test.module | 0 .../modules}/simpletest/tests/theme.test | 0 .../modules}/simpletest/tests/theme_test.info | 0 .../modules}/simpletest/tests/theme_test.module | 0 .../modules}/simpletest/tests/unicode.test | 0 .../modules}/simpletest/tests/update.test | 0 .../modules}/simpletest/tests/update_test_1.info | 0 .../simpletest/tests/update_test_1.install | 0 .../modules}/simpletest/tests/update_test_1.module | 0 .../modules}/simpletest/tests/update_test_2.info | 0 .../simpletest/tests/update_test_2.install | 0 .../modules}/simpletest/tests/update_test_2.module | 0 .../modules}/simpletest/tests/update_test_3.info | 0 .../simpletest/tests/update_test_3.install | 0 .../modules}/simpletest/tests/update_test_3.module | 0 .../modules}/simpletest/tests/upgrade/upgrade.test | 0 .../modules}/simpletest/tests/url_alter_test.info | 0 .../simpletest/tests/url_alter_test.install | 0 .../simpletest/tests/url_alter_test.module | 0 .../modules}/simpletest/tests/xmlrpc.test | 0 .../modules}/simpletest/tests/xmlrpc_test.info | 0 .../modules}/simpletest/tests/xmlrpc_test.module | 0 .../modules}/statistics/statistics.admin.inc | 0 .../modules}/statistics/statistics.info | 0 .../modules}/statistics/statistics.install | 0 .../modules}/statistics/statistics.module | 0 .../modules}/statistics/statistics.pages.inc | 0 .../modules}/statistics/statistics.test | 0 .../modules}/statistics/statistics.tokens.inc | 0 {modules => core/modules}/syslog/syslog.info | 0 {modules => core/modules}/syslog/syslog.install | 0 {modules => core/modules}/syslog/syslog.module | 0 {modules => core/modules}/syslog/syslog.test | 0 {modules => core/modules}/system/html.tpl.php | 0 {modules => core/modules}/system/image.gd.inc | 0 .../modules}/system/maintenance-page.tpl.php | 0 {modules => core/modules}/system/page.tpl.php | 0 {modules => core/modules}/system/region.tpl.php | 0 .../modules}/system/system.admin-rtl.css | 0 {modules => core/modules}/system/system.admin.css | 0 {modules => core/modules}/system/system.admin.inc | 0 {modules => core/modules}/system/system.api.php | 0 .../modules}/system/system.archiver.inc | 0 .../modules}/system/system.base-rtl.css | 0 {modules => core/modules}/system/system.base.css | 0 {modules => core/modules}/system/system.cron.js | 0 {modules => core/modules}/system/system.info | 0 {modules => core/modules}/system/system.install | 0 {modules => core/modules}/system/system.js | 0 {modules => core/modules}/system/system.mail.inc | 0 .../modules}/system/system.maintenance.css | 0 .../modules}/system/system.menus-rtl.css | 0 {modules => core/modules}/system/system.menus.css | 0 .../modules}/system/system.messages-rtl.css | 0 .../modules}/system/system.messages.css | 0 {modules => core/modules}/system/system.module | 0 {modules => core/modules}/system/system.queue.inc | 0 {modules => core/modules}/system/system.tar.inc | 0 {modules => core/modules}/system/system.test | 0 .../modules}/system/system.theme-rtl.css | 0 {modules => core/modules}/system/system.theme.css | 0 {modules => core/modules}/system/system.tokens.inc | 0 .../modules}/system/system.updater.inc | 0 {modules => core/modules}/system/theme.api.php | 0 .../modules}/taxonomy/taxonomy-term.tpl.php | 0 .../modules}/taxonomy/taxonomy.admin.inc | 0 .../modules}/taxonomy/taxonomy.api.php | 0 {modules => core/modules}/taxonomy/taxonomy.css | 0 {modules => core/modules}/taxonomy/taxonomy.info | 0 .../modules}/taxonomy/taxonomy.install | 0 {modules => core/modules}/taxonomy/taxonomy.js | 0 {modules => core/modules}/taxonomy/taxonomy.module | 0 .../modules}/taxonomy/taxonomy.pages.inc | 0 {modules => core/modules}/taxonomy/taxonomy.test | 0 .../modules}/taxonomy/taxonomy.tokens.inc | 0 {modules => core/modules}/toolbar/toolbar-rtl.css | 0 {modules => core/modules}/toolbar/toolbar.css | 0 {modules => core/modules}/toolbar/toolbar.info | 0 {modules => core/modules}/toolbar/toolbar.js | 0 {modules => core/modules}/toolbar/toolbar.module | 0 {modules => core/modules}/toolbar/toolbar.png | Bin 558 -> 558 bytes {modules => core/modules}/toolbar/toolbar.tpl.php | 0 {modules => core/modules}/tracker/tracker.css | 0 {modules => core/modules}/tracker/tracker.info | 0 {modules => core/modules}/tracker/tracker.install | 0 {modules => core/modules}/tracker/tracker.module | 0 .../modules}/tracker/tracker.pages.inc | 0 {modules => core/modules}/tracker/tracker.test | 0 .../translation/tests/translation_test.info | 0 .../translation/tests/translation_test.module | 0 .../modules}/translation/translation.info | 0 .../modules}/translation/translation.module | 0 .../modules}/translation/translation.pages.inc | 0 .../modules}/translation/translation.test | 0 .../modules}/trigger/tests/trigger_test.info | 0 .../modules}/trigger/tests/trigger_test.module | 0 .../modules}/trigger/trigger.admin.inc | 0 {modules => core/modules}/trigger/trigger.api.php | 0 {modules => core/modules}/trigger/trigger.info | 0 {modules => core/modules}/trigger/trigger.install | 0 {modules => core/modules}/trigger/trigger.module | 0 {modules => core/modules}/trigger/trigger.test | 0 .../modules}/update/tests/aaa_update_test.1_0.xml | 0 .../modules}/update/tests/aaa_update_test.info | 0 .../modules}/update/tests/aaa_update_test.module | 0 .../update/tests/aaa_update_test.no-releases.xml | 0 .../modules}/update/tests/aaa_update_test.tar.gz | Bin 384 -> 384 bytes .../modules}/update/tests/bbb_update_test.1_0.xml | 0 .../modules}/update/tests/bbb_update_test.info | 0 .../modules}/update/tests/bbb_update_test.module | 0 .../modules}/update/tests/ccc_update_test.1_0.xml | 0 .../modules}/update/tests/ccc_update_test.info | 0 .../modules}/update/tests/ccc_update_test.module | 0 .../modules}/update/tests/drupal.0.xml | 0 .../modules}/update/tests/drupal.1.xml | 0 .../modules}/update/tests/drupal.2-sec.xml | 0 .../modules}/update/tests/drupal.dev.xml | 0 .../modules}/update/tests/update_test.info | 0 .../modules}/update/tests/update_test.module | 0 .../update/tests/update_test_basetheme.1_1-sec.xml | 0 .../update/tests/update_test_subtheme.1_0.xml | 0 {modules => core/modules}/update/update-rtl.css | 0 {modules => core/modules}/update/update.api.php | 0 .../modules}/update/update.authorize.inc | 0 .../modules}/update/update.compare.inc | 0 {modules => core/modules}/update/update.css | 0 {modules => core/modules}/update/update.fetch.inc | 0 {modules => core/modules}/update/update.info | 0 {modules => core/modules}/update/update.install | 0 .../modules}/update/update.manager.inc | 0 {modules => core/modules}/update/update.module | 0 {modules => core/modules}/update/update.report.inc | 0 .../modules}/update/update.settings.inc | 0 {modules => core/modules}/update/update.test | 0 .../modules}/user/tests/user_form_test.info | 0 .../modules}/user/tests/user_form_test.module | 0 .../modules}/user/user-picture.tpl.php | 0 .../modules}/user/user-profile-category.tpl.php | 0 .../modules}/user/user-profile-item.tpl.php | 0 .../modules}/user/user-profile.tpl.php | 0 {modules => core/modules}/user/user-rtl.css | 0 {modules => core/modules}/user/user.admin.inc | 0 {modules => core/modules}/user/user.api.php | 0 {modules => core/modules}/user/user.css | 0 {modules => core/modules}/user/user.info | 0 {modules => core/modules}/user/user.install | 0 {modules => core/modules}/user/user.js | 0 {modules => core/modules}/user/user.module | 0 {modules => core/modules}/user/user.pages.inc | 0 {modules => core/modules}/user/user.permissions.js | 0 {modules => core/modules}/user/user.test | 0 {modules => core/modules}/user/user.tokens.inc | 0 {scripts => core/scripts}/code-clean.sh | 0 {scripts => core/scripts}/cron-curl.sh | 0 {scripts => core/scripts}/cron-lynx.sh | 0 {scripts => core/scripts}/drupal.sh | 0 {scripts => core/scripts}/dump-database-d6.sh | 0 {scripts => core/scripts}/generate-d6-content.sh | 0 {scripts => core/scripts}/password-hash.sh | 0 {scripts => core/scripts}/run-tests.sh | 0 {themes => core/themes}/README.txt | 0 {themes => core/themes}/bartik/bartik.info | 0 {themes => core/themes}/bartik/color/base.png | Bin 106 -> 106 bytes {themes => core/themes}/bartik/color/color.inc | 0 {themes => core/themes}/bartik/color/preview.css | 0 {themes => core/themes}/bartik/color/preview.html | 0 {themes => core/themes}/bartik/color/preview.js | 0 {themes => core/themes}/bartik/color/preview.png | Bin 106 -> 106 bytes {themes => core/themes}/bartik/css/colors.css | 0 {themes => core/themes}/bartik/css/ie-rtl.css | 0 {themes => core/themes}/bartik/css/ie.css | 0 {themes => core/themes}/bartik/css/ie6.css | 0 {themes => core/themes}/bartik/css/layout-rtl.css | 0 {themes => core/themes}/bartik/css/layout.css | 0 .../themes}/bartik/css/maintenance-page.css | 0 {themes => core/themes}/bartik/css/print.css | 0 {themes => core/themes}/bartik/css/style-rtl.css | 0 {themes => core/themes}/bartik/css/style.css | 0 {themes => core/themes}/bartik/images/add.png | Bin 94 -> 94 bytes {themes => core/themes}/bartik/images/buttons.png | Bin 831 -> 831 bytes .../themes}/bartik/images/comment-arrow-rtl.gif | Bin 97 -> 97 bytes .../themes}/bartik/images/comment-arrow.gif | Bin 97 -> 97 bytes .../themes}/bartik/images/search-button.png | Bin 725 -> 725 bytes .../themes}/bartik/images/tabs-border.png | Bin 83 -> 83 bytes {themes => core/themes}/bartik/logo.png | Bin 3479 -> 3479 bytes {themes => core/themes}/bartik/screenshot.png | Bin 19658 -> 19658 bytes {themes => core/themes}/bartik/template.php | 0 .../bartik/templates/comment-wrapper.tpl.php | 0 .../themes}/bartik/templates/comment.tpl.php | 0 .../bartik/templates/maintenance-page.tpl.php | 0 .../themes}/bartik/templates/node.tpl.php | 0 .../themes}/bartik/templates/page.tpl.php | 0 .../themes}/engines/phptemplate/phptemplate.engine | 0 {themes => core/themes}/garland/color/base.png | Bin 20894 -> 20894 bytes {themes => core/themes}/garland/color/color.inc | 0 {themes => core/themes}/garland/color/preview.css | 0 {themes => core/themes}/garland/color/preview.png | Bin 9965 -> 9965 bytes {themes => core/themes}/garland/comment.tpl.php | 0 {themes => core/themes}/garland/fix-ie-rtl.css | 0 {themes => core/themes}/garland/fix-ie.css | 0 {themes => core/themes}/garland/garland.info | 0 .../themes}/garland/images/bg-bar-white.png | Bin 103 -> 103 bytes {themes => core/themes}/garland/images/bg-bar.png | Bin 125 -> 125 bytes .../themes}/garland/images/bg-content-left.png | Bin 2889 -> 2889 bytes .../themes}/garland/images/bg-content-right.png | Bin 2819 -> 2819 bytes .../themes}/garland/images/bg-content.png | Bin 485 -> 485 bytes .../garland/images/bg-navigation-item-hover.png | Bin 441 -> 441 bytes .../themes}/garland/images/bg-navigation-item.png | Bin 499 -> 499 bytes .../themes}/garland/images/bg-navigation.png | Bin 104 -> 104 bytes {themes => core/themes}/garland/images/bg-tab.png | Bin 115 -> 115 bytes {themes => core/themes}/garland/images/body.png | Bin 680 -> 680 bytes .../themes}/garland/images/gradient-inner.png | Bin 188 -> 188 bytes .../themes}/garland/images/menu-collapsed-rtl.gif | Bin 176 -> 176 bytes .../themes}/garland/images/menu-collapsed.gif | Bin 176 -> 176 bytes .../themes}/garland/images/menu-expanded.gif | Bin 183 -> 183 bytes .../themes}/garland/images/menu-leaf.gif | Bin 174 -> 174 bytes .../themes}/garland/images/task-list.png | Bin 128 -> 128 bytes {themes => core/themes}/garland/logo.png | Bin 5116 -> 5116 bytes .../themes}/garland/maintenance-page.tpl.php | 0 {themes => core/themes}/garland/node.tpl.php | 0 {themes => core/themes}/garland/page.tpl.php | 0 {themes => core/themes}/garland/print.css | 0 {themes => core/themes}/garland/screenshot.png | Bin 10950 -> 10950 bytes {themes => core/themes}/garland/style-rtl.css | 0 {themes => core/themes}/garland/style.css | 0 {themes => core/themes}/garland/template.php | 0 {themes => core/themes}/garland/theme-settings.php | 0 {themes => core/themes}/seven/ie.css | 0 {themes => core/themes}/seven/ie6.css | 0 {themes => core/themes}/seven/images/add.png | Bin 160 -> 160 bytes {themes => core/themes}/seven/images/arrow-asc.png | Bin 88 -> 88 bytes .../themes}/seven/images/arrow-desc.png | Bin 95 -> 95 bytes .../themes}/seven/images/arrow-next.png | Bin 118 -> 118 bytes .../themes}/seven/images/arrow-prev.png | Bin 115 -> 115 bytes {themes => core/themes}/seven/images/buttons.png | Bin 786 -> 786 bytes {themes => core/themes}/seven/images/fc-rtl.png | Bin 76 -> 76 bytes {themes => core/themes}/seven/images/fc.png | Bin 82 -> 82 bytes {themes => core/themes}/seven/images/list-item.png | Bin 195 -> 195 bytes .../themes}/seven/images/task-check.png | Bin 261 -> 261 bytes {themes => core/themes}/seven/images/task-item.png | Bin 105 -> 105 bytes .../seven/images/ui-icons-222222-256x240.png | Bin 3702 -> 3702 bytes .../seven/images/ui-icons-454545-256x240.png | Bin 3702 -> 3702 bytes .../seven/images/ui-icons-800000-256x240.png | Bin 3702 -> 3702 bytes .../seven/images/ui-icons-888888-256x240.png | Bin 3702 -> 3702 bytes .../seven/images/ui-icons-ffffff-256x240.png | Bin 3702 -> 3702 bytes {themes => core/themes}/seven/jquery.ui.theme.css | 0 {themes => core/themes}/seven/logo.png | Bin 3905 -> 3905 bytes .../themes}/seven/maintenance-page.tpl.php | 0 {themes => core/themes}/seven/page.tpl.php | 0 {themes => core/themes}/seven/reset.css | 0 {themes => core/themes}/seven/screenshot.png | Bin 12298 -> 12298 bytes {themes => core/themes}/seven/seven.info | 0 {themes => core/themes}/seven/style-rtl.css | 0 {themes => core/themes}/seven/style.css | 0 {themes => core/themes}/seven/template.php | 0 .../themes}/seven/vertical-tabs-rtl.css | 0 {themes => core/themes}/seven/vertical-tabs.css | 0 {themes => core/themes}/stark/README.txt | 0 {themes => core/themes}/stark/layout.css | 0 {themes => core/themes}/stark/logo.png | Bin 2326 -> 2326 bytes {themes => core/themes}/stark/screenshot.png | Bin 11662 -> 11662 bytes {themes => core/themes}/stark/stark.info | 0 {themes => core/themes}/tests/README.txt | 0 .../themes}/tests/test_theme/template.php | 0 .../themes}/tests/test_theme/test_theme.info | 0 .../update_test_basetheme.info | 0 .../update_test_subtheme/update_test_subtheme.info | 0 update.php => core/update.php | 0 xmlrpc.php => core/xmlrpc.php | 0 957 files changed, 0 insertions(+), 0 deletions(-) rename CHANGELOG.txt => core/CHANGELOG.txt (100%) rename COPYRIGHT.txt => core/COPYRIGHT.txt (100%) rename INSTALL.mysql.txt => core/INSTALL.mysql.txt (100%) rename INSTALL.pgsql.txt => core/INSTALL.pgsql.txt (100%) rename INSTALL.sqlite.txt => core/INSTALL.sqlite.txt (100%) rename INSTALL.txt => core/INSTALL.txt (100%) rename LICENSE.txt => core/LICENSE.txt (100%) rename MAINTAINERS.txt => core/MAINTAINERS.txt (100%) rename UPGRADE.txt => core/UPGRADE.txt (100%) rename authorize.php => core/authorize.php (100%) rename cron.php => core/cron.php (100%) rename {includes => core/includes}/actions.inc (100%) rename {includes => core/includes}/ajax.inc (100%) rename {includes => core/includes}/archiver.inc (100%) rename {includes => core/includes}/authorize.inc (100%) rename {includes => core/includes}/batch.inc (100%) rename {includes => core/includes}/batch.queue.inc (100%) rename {includes => core/includes}/bootstrap.inc (100%) rename {includes => core/includes}/cache-install.inc (100%) rename {includes => core/includes}/cache.inc (100%) rename {includes => core/includes}/common.inc (100%) rename {includes => core/includes}/database/database.inc (100%) rename {includes => core/includes}/database/log.inc (100%) rename {includes => core/includes}/database/mysql/database.inc (100%) rename {includes => core/includes}/database/mysql/install.inc (100%) rename {includes => core/includes}/database/mysql/query.inc (100%) rename {includes => core/includes}/database/mysql/schema.inc (100%) rename {includes => core/includes}/database/pgsql/database.inc (100%) rename {includes => core/includes}/database/pgsql/install.inc (100%) rename {includes => core/includes}/database/pgsql/query.inc (100%) rename {includes => core/includes}/database/pgsql/schema.inc (100%) rename {includes => core/includes}/database/pgsql/select.inc (100%) rename {includes => core/includes}/database/prefetch.inc (100%) rename {includes => core/includes}/database/query.inc (100%) rename {includes => core/includes}/database/schema.inc (100%) rename {includes => core/includes}/database/select.inc (100%) rename {includes => core/includes}/database/sqlite/database.inc (100%) rename {includes => core/includes}/database/sqlite/install.inc (100%) rename {includes => core/includes}/database/sqlite/query.inc (100%) rename {includes => core/includes}/database/sqlite/schema.inc (100%) rename {includes => core/includes}/database/sqlite/select.inc (100%) rename {includes => core/includes}/date.inc (100%) rename {includes => core/includes}/entity.inc (100%) rename {includes => core/includes}/errors.inc (100%) rename {includes => core/includes}/file.inc (100%) rename {includes => core/includes}/file.mimetypes.inc (100%) rename {includes => core/includes}/filetransfer/filetransfer.inc (100%) rename {includes => core/includes}/filetransfer/ftp.inc (100%) rename {includes => core/includes}/filetransfer/local.inc (100%) rename {includes => core/includes}/filetransfer/ssh.inc (100%) rename {includes => core/includes}/form.inc (100%) rename {includes => core/includes}/graph.inc (100%) rename {includes => core/includes}/image.inc (100%) rename {includes => core/includes}/install.core.inc (100%) rename {includes => core/includes}/install.inc (100%) rename {includes => core/includes}/iso.inc (100%) rename {includes => core/includes}/language.inc (100%) rename {includes => core/includes}/locale.inc (100%) rename {includes => core/includes}/lock.inc (100%) rename {includes => core/includes}/mail.inc (100%) rename {includes => core/includes}/menu.inc (100%) rename {includes => core/includes}/module.inc (100%) rename {includes => core/includes}/pager.inc (100%) rename {includes => core/includes}/password.inc (100%) rename {includes => core/includes}/path.inc (100%) rename {includes => core/includes}/registry.inc (100%) rename {includes => core/includes}/session.inc (100%) rename {includes => core/includes}/stream_wrappers.inc (100%) rename {includes => core/includes}/tablesort.inc (100%) rename {includes => core/includes}/theme.inc (100%) rename {includes => core/includes}/theme.maintenance.inc (100%) rename {includes => core/includes}/token.inc (100%) rename {includes => core/includes}/unicode.entities.inc (100%) rename {includes => core/includes}/unicode.inc (100%) rename {includes => core/includes}/update.inc (100%) rename {includes => core/includes}/updater.inc (100%) rename {includes => core/includes}/utility.inc (100%) rename {includes => core/includes}/xmlrpc.inc (100%) rename {includes => core/includes}/xmlrpcs.inc (100%) rename install.php => core/install.php (100%) rename {misc => core/misc}/ajax.js (100%) rename {misc => core/misc}/arrow-asc.png (100%) rename {misc => core/misc}/arrow-desc.png (100%) rename {misc => core/misc}/authorize.js (100%) rename {misc => core/misc}/autocomplete.js (100%) rename {misc => core/misc}/batch.js (100%) rename {misc => core/misc}/collapse.js (100%) rename {misc => core/misc}/configure.png (100%) rename {misc => core/misc}/draggable.png (100%) rename {misc => core/misc}/drupal.js (100%) rename {misc => core/misc}/druplicon.png (100%) rename {misc => core/misc}/farbtastic/farbtastic.css (100%) rename {misc => core/misc}/farbtastic/farbtastic.js (100%) rename {misc => core/misc}/farbtastic/marker.png (100%) rename {misc => core/misc}/farbtastic/mask.png (100%) rename {misc => core/misc}/farbtastic/wheel.png (100%) rename {misc => core/misc}/favicon.ico (100%) rename {misc => core/misc}/feed.png (100%) rename {misc => core/misc}/form.js (100%) rename {misc => core/misc}/forum-icons.png (100%) rename {misc => core/misc}/grippie.png (100%) rename {misc => core/misc}/help.png (100%) rename {misc => core/misc}/jquery.ba-bbq.js (100%) rename {misc => core/misc}/jquery.cookie.js (100%) rename {misc => core/misc}/jquery.form.js (100%) rename {misc => core/misc}/jquery.js (100%) rename {misc => core/misc}/jquery.once.js (100%) rename {misc => core/misc}/machine-name.js (100%) rename {misc => core/misc}/menu-collapsed-rtl.png (100%) rename {misc => core/misc}/menu-collapsed.png (100%) rename {misc => core/misc}/menu-expanded.png (100%) rename {misc => core/misc}/menu-leaf.png (100%) rename {misc => core/misc}/message-16-error.png (100%) rename {misc => core/misc}/message-16-help.png (100%) rename {misc => core/misc}/message-16-info.png (100%) rename {misc => core/misc}/message-16-ok.png (100%) rename {misc => core/misc}/message-16-warning.png (100%) rename {misc => core/misc}/message-24-error.png (100%) rename {misc => core/misc}/message-24-help.png (100%) rename {misc => core/misc}/message-24-info.png (100%) rename {misc => core/misc}/message-24-ok.png (100%) rename {misc => core/misc}/message-24-warning.png (100%) rename {misc => core/misc}/permissions.png (100%) rename {misc => core/misc}/powered-black-135x42.png (100%) rename {misc => core/misc}/powered-black-80x15.png (100%) rename {misc => core/misc}/powered-black-88x31.png (100%) rename {misc => core/misc}/powered-blue-135x42.png (100%) rename {misc => core/misc}/powered-blue-80x15.png (100%) rename {misc => core/misc}/powered-blue-88x31.png (100%) rename {misc => core/misc}/powered-gray-135x42.png (100%) rename {misc => core/misc}/powered-gray-80x15.png (100%) rename {misc => core/misc}/powered-gray-88x31.png (100%) rename {misc => core/misc}/print-rtl.css (100%) rename {misc => core/misc}/print.css (100%) rename {misc => core/misc}/progress.gif (100%) rename {misc => core/misc}/progress.js (100%) rename {misc => core/misc}/states.js (100%) rename {misc => core/misc}/tabledrag.js (100%) rename {misc => core/misc}/tableheader.js (100%) rename {misc => core/misc}/tableselect.js (100%) rename {misc => core/misc}/textarea.js (100%) rename {misc => core/misc}/throbber.gif (100%) rename {misc => core/misc}/timezone.js (100%) rename {misc => core/misc}/tree-bottom.png (100%) rename {misc => core/misc}/tree.png (100%) rename {misc => core/misc}/ui/images/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename {misc => core/misc}/ui/images/ui-bg_flat_75_ffffff_40x100.png (100%) rename {misc => core/misc}/ui/images/ui-bg_glass_55_fbf9ee_1x400.png (100%) rename {misc => core/misc}/ui/images/ui-bg_glass_65_ffffff_1x400.png (100%) rename {misc => core/misc}/ui/images/ui-bg_glass_75_dadada_1x400.png (100%) rename {misc => core/misc}/ui/images/ui-bg_glass_75_e6e6e6_1x400.png (100%) rename {misc => core/misc}/ui/images/ui-bg_glass_95_fef1ec_1x400.png (100%) rename {misc => core/misc}/ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png (100%) rename {misc => core/misc}/ui/images/ui-icons_222222_256x240.png (100%) rename {misc => core/misc}/ui/images/ui-icons_2e83ff_256x240.png (100%) rename {misc => core/misc}/ui/images/ui-icons_454545_256x240.png (100%) rename {misc => core/misc}/ui/images/ui-icons_888888_256x240.png (100%) rename {misc => core/misc}/ui/images/ui-icons_cd0a0a_256x240.png (100%) rename {misc => core/misc}/ui/jquery.effects.blind.min.js (100%) rename {misc => core/misc}/ui/jquery.effects.bounce.min.js (100%) rename {misc => core/misc}/ui/jquery.effects.clip.min.js (100%) rename {misc => core/misc}/ui/jquery.effects.core.min.js (100%) rename {misc => core/misc}/ui/jquery.effects.drop.min.js (100%) rename {misc => core/misc}/ui/jquery.effects.explode.min.js (100%) rename {misc => core/misc}/ui/jquery.effects.fade.min.js (100%) rename {misc => core/misc}/ui/jquery.effects.fold.min.js (100%) rename {misc => core/misc}/ui/jquery.effects.highlight.min.js (100%) rename {misc => core/misc}/ui/jquery.effects.pulsate.min.js (100%) rename {misc => core/misc}/ui/jquery.effects.scale.min.js (100%) rename {misc => core/misc}/ui/jquery.effects.shake.min.js (100%) rename {misc => core/misc}/ui/jquery.effects.slide.min.js (100%) rename {misc => core/misc}/ui/jquery.effects.transfer.min.js (100%) rename {misc => core/misc}/ui/jquery.ui.accordion.css (100%) rename {misc => core/misc}/ui/jquery.ui.accordion.min.js (100%) rename {misc => core/misc}/ui/jquery.ui.autocomplete.css (100%) rename {misc => core/misc}/ui/jquery.ui.autocomplete.min.js (100%) rename {misc => core/misc}/ui/jquery.ui.button.css (100%) rename {misc => core/misc}/ui/jquery.ui.button.min.js (100%) rename {misc => core/misc}/ui/jquery.ui.core.css (100%) rename {misc => core/misc}/ui/jquery.ui.core.min.js (100%) rename {misc => core/misc}/ui/jquery.ui.datepicker.css (100%) rename {misc => core/misc}/ui/jquery.ui.datepicker.min.js (100%) rename {misc => core/misc}/ui/jquery.ui.dialog.css (100%) rename {misc => core/misc}/ui/jquery.ui.dialog.min.js (100%) rename {misc => core/misc}/ui/jquery.ui.draggable.min.js (100%) rename {misc => core/misc}/ui/jquery.ui.droppable.min.js (100%) rename {misc => core/misc}/ui/jquery.ui.mouse.min.js (100%) rename {misc => core/misc}/ui/jquery.ui.position.min.js (100%) rename {misc => core/misc}/ui/jquery.ui.progressbar.css (100%) rename {misc => core/misc}/ui/jquery.ui.progressbar.min.js (100%) rename {misc => core/misc}/ui/jquery.ui.resizable.css (100%) rename {misc => core/misc}/ui/jquery.ui.resizable.min.js (100%) rename {misc => core/misc}/ui/jquery.ui.selectable.css (100%) rename {misc => core/misc}/ui/jquery.ui.selectable.min.js (100%) rename {misc => core/misc}/ui/jquery.ui.slider.css (100%) rename {misc => core/misc}/ui/jquery.ui.slider.min.js (100%) rename {misc => core/misc}/ui/jquery.ui.sortable.min.js (100%) rename {misc => core/misc}/ui/jquery.ui.tabs.css (100%) rename {misc => core/misc}/ui/jquery.ui.tabs.min.js (100%) rename {misc => core/misc}/ui/jquery.ui.theme.css (100%) rename {misc => core/misc}/ui/jquery.ui.widget.min.js (100%) rename {misc => core/misc}/vertical-tabs-rtl.css (100%) rename {misc => core/misc}/vertical-tabs.css (100%) rename {misc => core/misc}/vertical-tabs.js (100%) rename {misc => core/misc}/watchdog-error.png (100%) rename {misc => core/misc}/watchdog-ok.png (100%) rename {misc => core/misc}/watchdog-warning.png (100%) rename {modules => core/modules}/README.txt (100%) rename {modules => core/modules}/aggregator/aggregator-feed-source.tpl.php (100%) rename {modules => core/modules}/aggregator/aggregator-item.tpl.php (100%) rename {modules => core/modules}/aggregator/aggregator-rtl.css (100%) rename {modules => core/modules}/aggregator/aggregator-summary-item.tpl.php (100%) rename {modules => core/modules}/aggregator/aggregator-summary-items.tpl.php (100%) rename {modules => core/modules}/aggregator/aggregator-wrapper.tpl.php (100%) rename {modules => core/modules}/aggregator/aggregator.admin.inc (100%) rename {modules => core/modules}/aggregator/aggregator.api.php (100%) rename {modules => core/modules}/aggregator/aggregator.css (100%) rename {modules => core/modules}/aggregator/aggregator.fetcher.inc (100%) rename {modules => core/modules}/aggregator/aggregator.info (100%) rename {modules => core/modules}/aggregator/aggregator.install (100%) rename {modules => core/modules}/aggregator/aggregator.module (100%) rename {modules => core/modules}/aggregator/aggregator.pages.inc (100%) rename {modules => core/modules}/aggregator/aggregator.parser.inc (100%) rename {modules => core/modules}/aggregator/aggregator.processor.inc (100%) rename {modules => core/modules}/aggregator/aggregator.test (100%) rename {modules => core/modules}/aggregator/tests/aggregator_test.info (100%) rename {modules => core/modules}/aggregator/tests/aggregator_test.module (100%) rename {modules => core/modules}/aggregator/tests/aggregator_test_atom.xml (100%) rename {modules => core/modules}/aggregator/tests/aggregator_test_rss091.xml (100%) rename {modules => core/modules}/block/block-admin-display-form.tpl.php (100%) rename {modules => core/modules}/block/block.admin.inc (100%) rename {modules => core/modules}/block/block.api.php (100%) rename {modules => core/modules}/block/block.css (100%) rename {modules => core/modules}/block/block.info (100%) rename {modules => core/modules}/block/block.install (100%) rename {modules => core/modules}/block/block.js (100%) rename {modules => core/modules}/block/block.module (100%) rename {modules => core/modules}/block/block.test (100%) rename {modules => core/modules}/block/block.tpl.php (100%) rename {modules => core/modules}/block/tests/block_test.info (100%) rename {modules => core/modules}/block/tests/block_test.module (100%) rename {modules => core/modules}/blog/blog.info (100%) rename {modules => core/modules}/blog/blog.install (100%) rename {modules => core/modules}/blog/blog.module (100%) rename {modules => core/modules}/blog/blog.pages.inc (100%) rename {modules => core/modules}/blog/blog.test (100%) rename {modules => core/modules}/book/book-all-books-block.tpl.php (100%) rename {modules => core/modules}/book/book-export-html.tpl.php (100%) rename {modules => core/modules}/book/book-navigation.tpl.php (100%) rename {modules => core/modules}/book/book-node-export-html.tpl.php (100%) rename {modules => core/modules}/book/book-rtl.css (100%) rename {modules => core/modules}/book/book.admin.inc (100%) rename {modules => core/modules}/book/book.css (100%) rename {modules => core/modules}/book/book.info (100%) rename {modules => core/modules}/book/book.install (100%) rename {modules => core/modules}/book/book.js (100%) rename {modules => core/modules}/book/book.module (100%) rename {modules => core/modules}/book/book.pages.inc (100%) rename {modules => core/modules}/book/book.test (100%) rename {modules => core/modules}/color/color-rtl.css (100%) rename {modules => core/modules}/color/color.css (100%) rename {modules => core/modules}/color/color.info (100%) rename {modules => core/modules}/color/color.install (100%) rename {modules => core/modules}/color/color.js (100%) rename {modules => core/modules}/color/color.module (100%) rename {modules => core/modules}/color/color.test (100%) rename {modules => core/modules}/color/images/hook-rtl.png (100%) rename {modules => core/modules}/color/images/hook.png (100%) rename {modules => core/modules}/color/images/lock.png (100%) rename {modules => core/modules}/color/preview.html (100%) rename {modules => core/modules}/color/preview.js (100%) rename {modules => core/modules}/comment/comment-node-form.js (100%) rename {modules => core/modules}/comment/comment-rtl.css (100%) rename {modules => core/modules}/comment/comment-wrapper.tpl.php (100%) rename {modules => core/modules}/comment/comment.admin.inc (100%) rename {modules => core/modules}/comment/comment.api.php (100%) rename {modules => core/modules}/comment/comment.css (100%) rename {modules => core/modules}/comment/comment.info (100%) rename {modules => core/modules}/comment/comment.install (100%) rename {modules => core/modules}/comment/comment.module (100%) rename {modules => core/modules}/comment/comment.pages.inc (100%) rename {modules => core/modules}/comment/comment.test (100%) rename {modules => core/modules}/comment/comment.tokens.inc (100%) rename {modules => core/modules}/comment/comment.tpl.php (100%) rename {modules => core/modules}/contact/contact.admin.inc (100%) rename {modules => core/modules}/contact/contact.info (100%) rename {modules => core/modules}/contact/contact.install (100%) rename {modules => core/modules}/contact/contact.module (100%) rename {modules => core/modules}/contact/contact.pages.inc (100%) rename {modules => core/modules}/contact/contact.test (100%) rename {modules => core/modules}/contextual/contextual-rtl.css (100%) rename {modules => core/modules}/contextual/contextual.api.php (100%) rename {modules => core/modules}/contextual/contextual.css (100%) rename {modules => core/modules}/contextual/contextual.info (100%) rename {modules => core/modules}/contextual/contextual.js (100%) rename {modules => core/modules}/contextual/contextual.module (100%) rename {modules => core/modules}/contextual/images/gear-select.png (100%) rename {modules => core/modules}/dashboard/dashboard.api.php (100%) rename {modules => core/modules}/dashboard/dashboard.css (100%) rename {modules => core/modules}/dashboard/dashboard.info (100%) rename {modules => core/modules}/dashboard/dashboard.install (100%) rename {modules => core/modules}/dashboard/dashboard.js (100%) rename {modules => core/modules}/dashboard/dashboard.module (100%) rename {modules => core/modules}/dashboard/dashboard.test (100%) rename {modules => core/modules}/dblog/dblog-rtl.css (100%) rename {modules => core/modules}/dblog/dblog.admin.inc (100%) rename {modules => core/modules}/dblog/dblog.css (100%) rename {modules => core/modules}/dblog/dblog.info (100%) rename {modules => core/modules}/dblog/dblog.install (100%) rename {modules => core/modules}/dblog/dblog.module (100%) rename {modules => core/modules}/dblog/dblog.test (100%) rename {modules => core/modules}/field/field.api.php (100%) rename {modules => core/modules}/field/field.attach.inc (100%) rename {modules => core/modules}/field/field.crud.inc (100%) rename {modules => core/modules}/field/field.default.inc (100%) rename {modules => core/modules}/field/field.form.inc (100%) rename {modules => core/modules}/field/field.info (100%) rename {modules => core/modules}/field/field.info.inc (100%) rename {modules => core/modules}/field/field.install (100%) rename {modules => core/modules}/field/field.module (100%) rename {modules => core/modules}/field/field.multilingual.inc (100%) rename {modules => core/modules}/field/modules/field_sql_storage/field_sql_storage.info (100%) rename {modules => core/modules}/field/modules/field_sql_storage/field_sql_storage.install (100%) rename {modules => core/modules}/field/modules/field_sql_storage/field_sql_storage.module (100%) rename {modules => core/modules}/field/modules/field_sql_storage/field_sql_storage.test (100%) rename {modules => core/modules}/field/modules/list/list.info (100%) rename {modules => core/modules}/field/modules/list/list.install (100%) rename {modules => core/modules}/field/modules/list/list.module (100%) rename {modules => core/modules}/field/modules/list/tests/list.test (100%) rename {modules => core/modules}/field/modules/list/tests/list_test.info (100%) rename {modules => core/modules}/field/modules/list/tests/list_test.module (100%) rename {modules => core/modules}/field/modules/number/number.info (100%) rename {modules => core/modules}/field/modules/number/number.install (100%) rename {modules => core/modules}/field/modules/number/number.module (100%) rename {modules => core/modules}/field/modules/number/number.test (100%) rename {modules => core/modules}/field/modules/options/options.api.php (100%) rename {modules => core/modules}/field/modules/options/options.info (100%) rename {modules => core/modules}/field/modules/options/options.module (100%) rename {modules => core/modules}/field/modules/options/options.test (100%) rename {modules => core/modules}/field/modules/text/text.info (100%) rename {modules => core/modules}/field/modules/text/text.install (100%) rename {modules => core/modules}/field/modules/text/text.js (100%) rename {modules => core/modules}/field/modules/text/text.module (100%) rename {modules => core/modules}/field/modules/text/text.test (100%) rename {modules => core/modules}/field/tests/field.test (100%) rename {modules => core/modules}/field/tests/field_test.entity.inc (100%) rename {modules => core/modules}/field/tests/field_test.field.inc (100%) rename {modules => core/modules}/field/tests/field_test.info (100%) rename {modules => core/modules}/field/tests/field_test.install (100%) rename {modules => core/modules}/field/tests/field_test.module (100%) rename {modules => core/modules}/field/tests/field_test.storage.inc (100%) rename {modules => core/modules}/field/theme/field-rtl.css (100%) rename {modules => core/modules}/field/theme/field.css (100%) rename {modules => core/modules}/field/theme/field.tpl.php (100%) rename {modules => core/modules}/field_ui/field_ui-rtl.css (100%) rename {modules => core/modules}/field_ui/field_ui.admin.inc (100%) rename {modules => core/modules}/field_ui/field_ui.api.php (100%) rename {modules => core/modules}/field_ui/field_ui.css (100%) rename {modules => core/modules}/field_ui/field_ui.info (100%) rename {modules => core/modules}/field_ui/field_ui.js (100%) rename {modules => core/modules}/field_ui/field_ui.module (100%) rename {modules => core/modules}/field_ui/field_ui.test (100%) rename {modules => core/modules}/file/file.api.php (100%) rename {modules => core/modules}/file/file.css (100%) rename {modules => core/modules}/file/file.field.inc (100%) rename {modules => core/modules}/file/file.info (100%) rename {modules => core/modules}/file/file.install (100%) rename {modules => core/modules}/file/file.js (100%) rename {modules => core/modules}/file/file.module (100%) rename {modules => core/modules}/file/icons/application-octet-stream.png (100%) rename {modules => core/modules}/file/icons/application-pdf.png (100%) rename {modules => core/modules}/file/icons/application-x-executable.png (100%) rename {modules => core/modules}/file/icons/audio-x-generic.png (100%) rename {modules => core/modules}/file/icons/image-x-generic.png (100%) rename {modules => core/modules}/file/icons/package-x-generic.png (100%) rename {modules => core/modules}/file/icons/text-html.png (100%) rename {modules => core/modules}/file/icons/text-plain.png (100%) rename {modules => core/modules}/file/icons/text-x-generic.png (100%) rename {modules => core/modules}/file/icons/text-x-script.png (100%) rename {modules => core/modules}/file/icons/video-x-generic.png (100%) rename {modules => core/modules}/file/icons/x-office-document.png (100%) rename {modules => core/modules}/file/icons/x-office-presentation.png (100%) rename {modules => core/modules}/file/icons/x-office-spreadsheet.png (100%) rename {modules => core/modules}/file/tests/file.test (100%) rename {modules => core/modules}/file/tests/file_module_test.info (100%) rename {modules => core/modules}/file/tests/file_module_test.module (100%) rename {modules => core/modules}/filter/filter.admin.inc (100%) rename {modules => core/modules}/filter/filter.admin.js (100%) rename {modules => core/modules}/filter/filter.api.php (100%) rename {modules => core/modules}/filter/filter.css (100%) rename {modules => core/modules}/filter/filter.info (100%) rename {modules => core/modules}/filter/filter.install (100%) rename {modules => core/modules}/filter/filter.js (100%) rename {modules => core/modules}/filter/filter.module (100%) rename {modules => core/modules}/filter/filter.pages.inc (100%) rename {modules => core/modules}/filter/filter.test (100%) rename {modules => core/modules}/filter/tests/filter.url-input.txt (100%) rename {modules => core/modules}/filter/tests/filter.url-output.txt (100%) rename {modules => core/modules}/forum/forum-icon.tpl.php (100%) rename {modules => core/modules}/forum/forum-list.tpl.php (100%) rename {modules => core/modules}/forum/forum-rtl.css (100%) rename {modules => core/modules}/forum/forum-submitted.tpl.php (100%) rename {modules => core/modules}/forum/forum-topic-list.tpl.php (100%) rename {modules => core/modules}/forum/forum.admin.inc (100%) rename {modules => core/modules}/forum/forum.css (100%) rename {modules => core/modules}/forum/forum.info (100%) rename {modules => core/modules}/forum/forum.install (100%) rename {modules => core/modules}/forum/forum.module (100%) rename {modules => core/modules}/forum/forum.pages.inc (100%) rename {modules => core/modules}/forum/forum.test (100%) rename {modules => core/modules}/forum/forums.tpl.php (100%) rename {modules => core/modules}/help/help-rtl.css (100%) rename {modules => core/modules}/help/help.admin.inc (100%) rename {modules => core/modules}/help/help.api.php (100%) rename {modules => core/modules}/help/help.css (100%) rename {modules => core/modules}/help/help.info (100%) rename {modules => core/modules}/help/help.module (100%) rename {modules => core/modules}/help/help.test (100%) rename {modules => core/modules}/image/image-rtl.css (100%) rename {modules => core/modules}/image/image.admin.css (100%) rename {modules => core/modules}/image/image.admin.inc (100%) rename {modules => core/modules}/image/image.api.php (100%) rename {modules => core/modules}/image/image.css (100%) rename {modules => core/modules}/image/image.effects.inc (100%) rename {modules => core/modules}/image/image.field.inc (100%) rename {modules => core/modules}/image/image.info (100%) rename {modules => core/modules}/image/image.install (100%) rename {modules => core/modules}/image/image.module (100%) rename {modules => core/modules}/image/image.test (100%) rename {modules => core/modules}/image/sample.png (100%) rename {modules => core/modules}/image/tests/image_module_test.info (100%) rename {modules => core/modules}/image/tests/image_module_test.module (100%) rename {modules => core/modules}/locale/locale.admin.inc (100%) rename {modules => core/modules}/locale/locale.api.php (100%) rename {modules => core/modules}/locale/locale.css (100%) rename {modules => core/modules}/locale/locale.datepicker.js (100%) rename {modules => core/modules}/locale/locale.info (100%) rename {modules => core/modules}/locale/locale.install (100%) rename {modules => core/modules}/locale/locale.module (100%) rename {modules => core/modules}/locale/locale.test (100%) rename {modules => core/modules}/locale/tests/locale_test.info (100%) rename {modules => core/modules}/locale/tests/locale_test.module (100%) rename {modules => core/modules}/locale/tests/translations/test.xx.po (100%) rename {modules => core/modules}/menu/menu.admin.inc (100%) rename {modules => core/modules}/menu/menu.admin.js (100%) rename {modules => core/modules}/menu/menu.api.php (100%) rename {modules => core/modules}/menu/menu.css (100%) rename {modules => core/modules}/menu/menu.info (100%) rename {modules => core/modules}/menu/menu.install (100%) rename {modules => core/modules}/menu/menu.js (100%) rename {modules => core/modules}/menu/menu.module (100%) rename {modules => core/modules}/menu/menu.test (100%) rename {modules => core/modules}/node/content_types.inc (100%) rename {modules => core/modules}/node/content_types.js (100%) rename {modules => core/modules}/node/node-rtl.css (100%) rename {modules => core/modules}/node/node.admin.inc (100%) rename {modules => core/modules}/node/node.api.php (100%) rename {modules => core/modules}/node/node.css (100%) rename {modules => core/modules}/node/node.info (100%) rename {modules => core/modules}/node/node.install (100%) rename {modules => core/modules}/node/node.js (100%) rename {modules => core/modules}/node/node.module (100%) rename {modules => core/modules}/node/node.pages.inc (100%) rename {modules => core/modules}/node/node.test (100%) rename {modules => core/modules}/node/node.tokens.inc (100%) rename {modules => core/modules}/node/node.tpl.php (100%) rename {modules => core/modules}/node/tests/node_access_test.info (100%) rename {modules => core/modules}/node/tests/node_access_test.module (100%) rename {modules => core/modules}/node/tests/node_test.info (100%) rename {modules => core/modules}/node/tests/node_test.module (100%) rename {modules => core/modules}/node/tests/node_test_exception.info (100%) rename {modules => core/modules}/node/tests/node_test_exception.module (100%) rename {modules => core/modules}/openid/login-bg.png (100%) rename {modules => core/modules}/openid/openid-rtl.css (100%) rename {modules => core/modules}/openid/openid.api.php (100%) rename {modules => core/modules}/openid/openid.css (100%) rename {modules => core/modules}/openid/openid.inc (100%) rename {modules => core/modules}/openid/openid.info (100%) rename {modules => core/modules}/openid/openid.install (100%) rename {modules => core/modules}/openid/openid.js (100%) rename {modules => core/modules}/openid/openid.module (100%) rename {modules => core/modules}/openid/openid.pages.inc (100%) rename {modules => core/modules}/openid/openid.test (100%) rename {modules => core/modules}/openid/tests/openid_test.info (100%) rename {modules => core/modules}/openid/tests/openid_test.install (100%) rename {modules => core/modules}/openid/tests/openid_test.module (100%) rename {modules => core/modules}/overlay/images/background.png (100%) rename {modules => core/modules}/overlay/images/close.png (100%) rename {modules => core/modules}/overlay/overlay-child.css (100%) rename {modules => core/modules}/overlay/overlay-child.js (100%) rename {modules => core/modules}/overlay/overlay-parent.css (100%) rename {modules => core/modules}/overlay/overlay-parent.js (100%) rename {modules => core/modules}/overlay/overlay.api.php (100%) rename {modules => core/modules}/overlay/overlay.info (100%) rename {modules => core/modules}/overlay/overlay.install (100%) rename {modules => core/modules}/overlay/overlay.module (100%) rename {modules => core/modules}/overlay/overlay.tpl.php (100%) rename {modules => core/modules}/path/path.admin.inc (100%) rename {modules => core/modules}/path/path.api.php (100%) rename {modules => core/modules}/path/path.info (100%) rename {modules => core/modules}/path/path.js (100%) rename {modules => core/modules}/path/path.module (100%) rename {modules => core/modules}/path/path.test (100%) rename {modules => core/modules}/php/php.info (100%) rename {modules => core/modules}/php/php.install (100%) rename {modules => core/modules}/php/php.module (100%) rename {modules => core/modules}/php/php.test (100%) rename {modules => core/modules}/poll/poll-bar--block.tpl.php (100%) rename {modules => core/modules}/poll/poll-bar.tpl.php (100%) rename {modules => core/modules}/poll/poll-results--block.tpl.php (100%) rename {modules => core/modules}/poll/poll-results.tpl.php (100%) rename {modules => core/modules}/poll/poll-rtl.css (100%) rename {modules => core/modules}/poll/poll-vote.tpl.php (100%) rename {modules => core/modules}/poll/poll.css (100%) rename {modules => core/modules}/poll/poll.info (100%) rename {modules => core/modules}/poll/poll.install (100%) rename {modules => core/modules}/poll/poll.module (100%) rename {modules => core/modules}/poll/poll.pages.inc (100%) rename {modules => core/modules}/poll/poll.test (100%) rename {modules => core/modules}/poll/poll.tokens.inc (100%) rename {modules => core/modules}/profile/profile-block.tpl.php (100%) rename {modules => core/modules}/profile/profile-listing.tpl.php (100%) rename {modules => core/modules}/profile/profile-wrapper.tpl.php (100%) rename {modules => core/modules}/profile/profile.admin.inc (100%) rename {modules => core/modules}/profile/profile.css (100%) rename {modules => core/modules}/profile/profile.info (100%) rename {modules => core/modules}/profile/profile.install (100%) rename {modules => core/modules}/profile/profile.js (100%) rename {modules => core/modules}/profile/profile.module (100%) rename {modules => core/modules}/profile/profile.pages.inc (100%) rename {modules => core/modules}/profile/profile.test (100%) rename {modules => core/modules}/rdf/rdf.api.php (100%) rename {modules => core/modules}/rdf/rdf.info (100%) rename {modules => core/modules}/rdf/rdf.install (100%) rename {modules => core/modules}/rdf/rdf.module (100%) rename {modules => core/modules}/rdf/rdf.test (100%) rename {modules => core/modules}/rdf/tests/rdf_test.info (100%) rename {modules => core/modules}/rdf/tests/rdf_test.install (100%) rename {modules => core/modules}/rdf/tests/rdf_test.module (100%) rename {modules => core/modules}/search/search-block-form.tpl.php (100%) rename {modules => core/modules}/search/search-result.tpl.php (100%) rename {modules => core/modules}/search/search-results.tpl.php (100%) rename {modules => core/modules}/search/search-rtl.css (100%) rename {modules => core/modules}/search/search.admin.inc (100%) rename {modules => core/modules}/search/search.api.php (100%) rename {modules => core/modules}/search/search.css (100%) rename {modules => core/modules}/search/search.extender.inc (100%) rename {modules => core/modules}/search/search.info (100%) rename {modules => core/modules}/search/search.install (100%) rename {modules => core/modules}/search/search.module (100%) rename {modules => core/modules}/search/search.pages.inc (100%) rename {modules => core/modules}/search/search.test (100%) rename {modules => core/modules}/search/tests/UnicodeTest.txt (100%) rename {modules => core/modules}/search/tests/search_embedded_form.info (100%) rename {modules => core/modules}/search/tests/search_embedded_form.module (100%) rename {modules => core/modules}/search/tests/search_extra_type.info (100%) rename {modules => core/modules}/search/tests/search_extra_type.module (100%) rename {modules => core/modules}/shortcut/shortcut-rtl.css (100%) rename {modules => core/modules}/shortcut/shortcut.admin.css (100%) rename {modules => core/modules}/shortcut/shortcut.admin.inc (100%) rename {modules => core/modules}/shortcut/shortcut.admin.js (100%) rename {modules => core/modules}/shortcut/shortcut.api.php (100%) rename {modules => core/modules}/shortcut/shortcut.css (100%) rename {modules => core/modules}/shortcut/shortcut.info (100%) rename {modules => core/modules}/shortcut/shortcut.install (100%) rename {modules => core/modules}/shortcut/shortcut.module (100%) rename {modules => core/modules}/shortcut/shortcut.png (100%) rename {modules => core/modules}/shortcut/shortcut.test (100%) rename {modules => core/modules}/simpletest/drupal_web_test_case.php (100%) rename {modules => core/modules}/simpletest/files/README.txt (100%) rename {modules => core/modules}/simpletest/files/css_test_files/comment_hacks.css (100%) rename {modules => core/modules}/simpletest/files/css_test_files/comment_hacks.css.optimized.css (100%) rename {modules => core/modules}/simpletest/files/css_test_files/comment_hacks.css.unoptimized.css (100%) rename {modules => core/modules}/simpletest/files/css_test_files/css_input_with_import.css (100%) rename {modules => core/modules}/simpletest/files/css_test_files/css_input_with_import.css.optimized.css (100%) rename {modules => core/modules}/simpletest/files/css_test_files/css_input_with_import.css.unoptimized.css (100%) rename {modules => core/modules}/simpletest/files/css_test_files/css_input_without_import.css (100%) rename {modules => core/modules}/simpletest/files/css_test_files/css_input_without_import.css.optimized.css (100%) rename {modules => core/modules}/simpletest/files/css_test_files/css_input_without_import.css.unoptimized.css (100%) rename {modules => core/modules}/simpletest/files/css_test_files/import1.css (100%) rename {modules => core/modules}/simpletest/files/css_test_files/import2.css (100%) rename {modules => core/modules}/simpletest/files/html-1.txt (100%) rename {modules => core/modules}/simpletest/files/html-2.html (100%) rename {modules => core/modules}/simpletest/files/image-1.png (100%) rename {modules => core/modules}/simpletest/files/image-2.jpg (100%) rename {modules => core/modules}/simpletest/files/image-test.gif (100%) rename {modules => core/modules}/simpletest/files/image-test.jpg (100%) rename {modules => core/modules}/simpletest/files/image-test.png (100%) rename {modules => core/modules}/simpletest/files/javascript-1.txt (100%) rename {modules => core/modules}/simpletest/files/javascript-2.script (100%) rename {modules => core/modules}/simpletest/files/php-1.txt (100%) rename {modules => core/modules}/simpletest/files/php-2.php (100%) rename {modules => core/modules}/simpletest/files/sql-1.txt (100%) rename {modules => core/modules}/simpletest/files/sql-2.sql (100%) rename {modules => core/modules}/simpletest/simpletest.api.php (100%) rename {modules => core/modules}/simpletest/simpletest.css (100%) rename {modules => core/modules}/simpletest/simpletest.info (100%) rename {modules => core/modules}/simpletest/simpletest.install (100%) rename {modules => core/modules}/simpletest/simpletest.js (100%) rename {modules => core/modules}/simpletest/simpletest.module (100%) rename {modules => core/modules}/simpletest/simpletest.pages.inc (100%) rename {modules => core/modules}/simpletest/simpletest.test (100%) rename {modules => core/modules}/simpletest/tests/actions.test (100%) rename {modules => core/modules}/simpletest/tests/actions_loop_test.info (100%) rename {modules => core/modules}/simpletest/tests/actions_loop_test.install (100%) rename {modules => core/modules}/simpletest/tests/actions_loop_test.module (100%) rename {modules => core/modules}/simpletest/tests/ajax.test (100%) rename {modules => core/modules}/simpletest/tests/ajax_forms_test.info (100%) rename {modules => core/modules}/simpletest/tests/ajax_forms_test.module (100%) rename {modules => core/modules}/simpletest/tests/ajax_test.info (100%) rename {modules => core/modules}/simpletest/tests/ajax_test.module (100%) rename {modules => core/modules}/simpletest/tests/batch.test (100%) rename {modules => core/modules}/simpletest/tests/batch_test.callbacks.inc (100%) rename {modules => core/modules}/simpletest/tests/batch_test.info (100%) rename {modules => core/modules}/simpletest/tests/batch_test.module (100%) rename {modules => core/modules}/simpletest/tests/bootstrap.test (100%) rename {modules => core/modules}/simpletest/tests/cache.test (100%) rename {modules => core/modules}/simpletest/tests/common.test (100%) rename {modules => core/modules}/simpletest/tests/common_test.css (100%) rename {modules => core/modules}/simpletest/tests/common_test.info (100%) rename {modules => core/modules}/simpletest/tests/common_test.module (100%) rename {modules => core/modules}/simpletest/tests/common_test.print.css (100%) rename {modules => core/modules}/simpletest/tests/common_test_info.txt (100%) rename {modules => core/modules}/simpletest/tests/database_test.info (100%) rename {modules => core/modules}/simpletest/tests/database_test.install (100%) rename {modules => core/modules}/simpletest/tests/database_test.module (100%) rename {modules => core/modules}/simpletest/tests/database_test.test (100%) rename {modules => core/modules}/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info (100%) rename {modules => core/modules}/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module (100%) rename {modules => core/modules}/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info (100%) rename {modules => core/modules}/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.module (100%) rename {modules => core/modules}/simpletest/tests/entity_cache_test.info (100%) rename {modules => core/modules}/simpletest/tests/entity_cache_test.module (100%) rename {modules => core/modules}/simpletest/tests/entity_cache_test_dependency.info (100%) rename {modules => core/modules}/simpletest/tests/entity_cache_test_dependency.module (100%) rename {modules => core/modules}/simpletest/tests/entity_crud_hook_test.info (100%) rename {modules => core/modules}/simpletest/tests/entity_crud_hook_test.module (100%) rename {modules => core/modules}/simpletest/tests/entity_crud_hook_test.test (100%) rename {modules => core/modules}/simpletest/tests/entity_query.test (100%) rename {modules => core/modules}/simpletest/tests/error.test (100%) rename {modules => core/modules}/simpletest/tests/error_test.info (100%) rename {modules => core/modules}/simpletest/tests/error_test.module (100%) rename {modules => core/modules}/simpletest/tests/file.test (100%) rename {modules => core/modules}/simpletest/tests/file_test.info (100%) rename {modules => core/modules}/simpletest/tests/file_test.module (100%) rename {modules => core/modules}/simpletest/tests/filetransfer.test (100%) rename {modules => core/modules}/simpletest/tests/filter_test.info (100%) rename {modules => core/modules}/simpletest/tests/filter_test.module (100%) rename {modules => core/modules}/simpletest/tests/form.test (100%) rename {modules => core/modules}/simpletest/tests/form_test.file.inc (100%) rename {modules => core/modules}/simpletest/tests/form_test.info (100%) rename {modules => core/modules}/simpletest/tests/form_test.module (100%) rename {modules => core/modules}/simpletest/tests/graph.test (100%) rename {modules => core/modules}/simpletest/tests/http.php (100%) rename {modules => core/modules}/simpletest/tests/https.php (100%) rename {modules => core/modules}/simpletest/tests/image.test (100%) rename {modules => core/modules}/simpletest/tests/image_test.info (100%) rename {modules => core/modules}/simpletest/tests/image_test.module (100%) rename {modules => core/modules}/simpletest/tests/lock.test (100%) rename {modules => core/modules}/simpletest/tests/mail.test (100%) rename {modules => core/modules}/simpletest/tests/menu.test (100%) rename {modules => core/modules}/simpletest/tests/menu_test.info (100%) rename {modules => core/modules}/simpletest/tests/menu_test.module (100%) rename {modules => core/modules}/simpletest/tests/module.test (100%) rename {modules => core/modules}/simpletest/tests/module_test.file.inc (100%) rename {modules => core/modules}/simpletest/tests/module_test.info (100%) rename {modules => core/modules}/simpletest/tests/module_test.install (100%) rename {modules => core/modules}/simpletest/tests/module_test.module (100%) rename {modules => core/modules}/simpletest/tests/password.test (100%) rename {modules => core/modules}/simpletest/tests/path.test (100%) rename {modules => core/modules}/simpletest/tests/registry.test (100%) rename {modules => core/modules}/simpletest/tests/requirements1_test.info (100%) rename {modules => core/modules}/simpletest/tests/requirements1_test.install (100%) rename {modules => core/modules}/simpletest/tests/requirements1_test.module (100%) rename {modules => core/modules}/simpletest/tests/requirements2_test.info (100%) rename {modules => core/modules}/simpletest/tests/requirements2_test.module (100%) rename {modules => core/modules}/simpletest/tests/schema.test (100%) rename {modules => core/modules}/simpletest/tests/session.test (100%) rename {modules => core/modules}/simpletest/tests/session_test.info (100%) rename {modules => core/modules}/simpletest/tests/session_test.module (100%) rename {modules => core/modules}/simpletest/tests/system.base.css (100%) rename {modules => core/modules}/simpletest/tests/system_dependencies_test.info (100%) rename {modules => core/modules}/simpletest/tests/system_dependencies_test.module (100%) rename {modules => core/modules}/simpletest/tests/system_test.info (100%) rename {modules => core/modules}/simpletest/tests/system_test.module (100%) rename {modules => core/modules}/simpletest/tests/tablesort.test (100%) rename {modules => core/modules}/simpletest/tests/taxonomy_test.info (100%) rename {modules => core/modules}/simpletest/tests/taxonomy_test.install (100%) rename {modules => core/modules}/simpletest/tests/taxonomy_test.module (100%) rename {modules => core/modules}/simpletest/tests/theme.test (100%) rename {modules => core/modules}/simpletest/tests/theme_test.info (100%) rename {modules => core/modules}/simpletest/tests/theme_test.module (100%) rename {modules => core/modules}/simpletest/tests/unicode.test (100%) rename {modules => core/modules}/simpletest/tests/update.test (100%) rename {modules => core/modules}/simpletest/tests/update_test_1.info (100%) rename {modules => core/modules}/simpletest/tests/update_test_1.install (100%) rename {modules => core/modules}/simpletest/tests/update_test_1.module (100%) rename {modules => core/modules}/simpletest/tests/update_test_2.info (100%) rename {modules => core/modules}/simpletest/tests/update_test_2.install (100%) rename {modules => core/modules}/simpletest/tests/update_test_2.module (100%) rename {modules => core/modules}/simpletest/tests/update_test_3.info (100%) rename {modules => core/modules}/simpletest/tests/update_test_3.install (100%) rename {modules => core/modules}/simpletest/tests/update_test_3.module (100%) rename {modules => core/modules}/simpletest/tests/upgrade/upgrade.test (100%) rename {modules => core/modules}/simpletest/tests/url_alter_test.info (100%) rename {modules => core/modules}/simpletest/tests/url_alter_test.install (100%) rename {modules => core/modules}/simpletest/tests/url_alter_test.module (100%) rename {modules => core/modules}/simpletest/tests/xmlrpc.test (100%) rename {modules => core/modules}/simpletest/tests/xmlrpc_test.info (100%) rename {modules => core/modules}/simpletest/tests/xmlrpc_test.module (100%) rename {modules => core/modules}/statistics/statistics.admin.inc (100%) rename {modules => core/modules}/statistics/statistics.info (100%) rename {modules => core/modules}/statistics/statistics.install (100%) rename {modules => core/modules}/statistics/statistics.module (100%) rename {modules => core/modules}/statistics/statistics.pages.inc (100%) rename {modules => core/modules}/statistics/statistics.test (100%) rename {modules => core/modules}/statistics/statistics.tokens.inc (100%) rename {modules => core/modules}/syslog/syslog.info (100%) rename {modules => core/modules}/syslog/syslog.install (100%) rename {modules => core/modules}/syslog/syslog.module (100%) rename {modules => core/modules}/syslog/syslog.test (100%) rename {modules => core/modules}/system/html.tpl.php (100%) rename {modules => core/modules}/system/image.gd.inc (100%) rename {modules => core/modules}/system/maintenance-page.tpl.php (100%) rename {modules => core/modules}/system/page.tpl.php (100%) rename {modules => core/modules}/system/region.tpl.php (100%) rename {modules => core/modules}/system/system.admin-rtl.css (100%) rename {modules => core/modules}/system/system.admin.css (100%) rename {modules => core/modules}/system/system.admin.inc (100%) rename {modules => core/modules}/system/system.api.php (100%) rename {modules => core/modules}/system/system.archiver.inc (100%) rename {modules => core/modules}/system/system.base-rtl.css (100%) rename {modules => core/modules}/system/system.base.css (100%) rename {modules => core/modules}/system/system.cron.js (100%) rename {modules => core/modules}/system/system.info (100%) rename {modules => core/modules}/system/system.install (100%) rename {modules => core/modules}/system/system.js (100%) rename {modules => core/modules}/system/system.mail.inc (100%) rename {modules => core/modules}/system/system.maintenance.css (100%) rename {modules => core/modules}/system/system.menus-rtl.css (100%) rename {modules => core/modules}/system/system.menus.css (100%) rename {modules => core/modules}/system/system.messages-rtl.css (100%) rename {modules => core/modules}/system/system.messages.css (100%) rename {modules => core/modules}/system/system.module (100%) rename {modules => core/modules}/system/system.queue.inc (100%) rename {modules => core/modules}/system/system.tar.inc (100%) rename {modules => core/modules}/system/system.test (100%) rename {modules => core/modules}/system/system.theme-rtl.css (100%) rename {modules => core/modules}/system/system.theme.css (100%) rename {modules => core/modules}/system/system.tokens.inc (100%) rename {modules => core/modules}/system/system.updater.inc (100%) rename {modules => core/modules}/system/theme.api.php (100%) rename {modules => core/modules}/taxonomy/taxonomy-term.tpl.php (100%) rename {modules => core/modules}/taxonomy/taxonomy.admin.inc (100%) rename {modules => core/modules}/taxonomy/taxonomy.api.php (100%) rename {modules => core/modules}/taxonomy/taxonomy.css (100%) rename {modules => core/modules}/taxonomy/taxonomy.info (100%) rename {modules => core/modules}/taxonomy/taxonomy.install (100%) rename {modules => core/modules}/taxonomy/taxonomy.js (100%) rename {modules => core/modules}/taxonomy/taxonomy.module (100%) rename {modules => core/modules}/taxonomy/taxonomy.pages.inc (100%) rename {modules => core/modules}/taxonomy/taxonomy.test (100%) rename {modules => core/modules}/taxonomy/taxonomy.tokens.inc (100%) rename {modules => core/modules}/toolbar/toolbar-rtl.css (100%) rename {modules => core/modules}/toolbar/toolbar.css (100%) rename {modules => core/modules}/toolbar/toolbar.info (100%) rename {modules => core/modules}/toolbar/toolbar.js (100%) rename {modules => core/modules}/toolbar/toolbar.module (100%) rename {modules => core/modules}/toolbar/toolbar.png (100%) rename {modules => core/modules}/toolbar/toolbar.tpl.php (100%) rename {modules => core/modules}/tracker/tracker.css (100%) rename {modules => core/modules}/tracker/tracker.info (100%) rename {modules => core/modules}/tracker/tracker.install (100%) rename {modules => core/modules}/tracker/tracker.module (100%) rename {modules => core/modules}/tracker/tracker.pages.inc (100%) rename {modules => core/modules}/tracker/tracker.test (100%) rename {modules => core/modules}/translation/tests/translation_test.info (100%) rename {modules => core/modules}/translation/tests/translation_test.module (100%) rename {modules => core/modules}/translation/translation.info (100%) rename {modules => core/modules}/translation/translation.module (100%) rename {modules => core/modules}/translation/translation.pages.inc (100%) rename {modules => core/modules}/translation/translation.test (100%) rename {modules => core/modules}/trigger/tests/trigger_test.info (100%) rename {modules => core/modules}/trigger/tests/trigger_test.module (100%) rename {modules => core/modules}/trigger/trigger.admin.inc (100%) rename {modules => core/modules}/trigger/trigger.api.php (100%) rename {modules => core/modules}/trigger/trigger.info (100%) rename {modules => core/modules}/trigger/trigger.install (100%) rename {modules => core/modules}/trigger/trigger.module (100%) rename {modules => core/modules}/trigger/trigger.test (100%) rename {modules => core/modules}/update/tests/aaa_update_test.1_0.xml (100%) rename {modules => core/modules}/update/tests/aaa_update_test.info (100%) rename {modules => core/modules}/update/tests/aaa_update_test.module (100%) rename {modules => core/modules}/update/tests/aaa_update_test.no-releases.xml (100%) rename {modules => core/modules}/update/tests/aaa_update_test.tar.gz (100%) rename {modules => core/modules}/update/tests/bbb_update_test.1_0.xml (100%) rename {modules => core/modules}/update/tests/bbb_update_test.info (100%) rename {modules => core/modules}/update/tests/bbb_update_test.module (100%) rename {modules => core/modules}/update/tests/ccc_update_test.1_0.xml (100%) rename {modules => core/modules}/update/tests/ccc_update_test.info (100%) rename {modules => core/modules}/update/tests/ccc_update_test.module (100%) rename {modules => core/modules}/update/tests/drupal.0.xml (100%) rename {modules => core/modules}/update/tests/drupal.1.xml (100%) rename {modules => core/modules}/update/tests/drupal.2-sec.xml (100%) rename {modules => core/modules}/update/tests/drupal.dev.xml (100%) rename {modules => core/modules}/update/tests/update_test.info (100%) rename {modules => core/modules}/update/tests/update_test.module (100%) rename {modules => core/modules}/update/tests/update_test_basetheme.1_1-sec.xml (100%) rename {modules => core/modules}/update/tests/update_test_subtheme.1_0.xml (100%) rename {modules => core/modules}/update/update-rtl.css (100%) rename {modules => core/modules}/update/update.api.php (100%) rename {modules => core/modules}/update/update.authorize.inc (100%) rename {modules => core/modules}/update/update.compare.inc (100%) rename {modules => core/modules}/update/update.css (100%) rename {modules => core/modules}/update/update.fetch.inc (100%) rename {modules => core/modules}/update/update.info (100%) rename {modules => core/modules}/update/update.install (100%) rename {modules => core/modules}/update/update.manager.inc (100%) rename {modules => core/modules}/update/update.module (100%) rename {modules => core/modules}/update/update.report.inc (100%) rename {modules => core/modules}/update/update.settings.inc (100%) rename {modules => core/modules}/update/update.test (100%) rename {modules => core/modules}/user/tests/user_form_test.info (100%) rename {modules => core/modules}/user/tests/user_form_test.module (100%) rename {modules => core/modules}/user/user-picture.tpl.php (100%) rename {modules => core/modules}/user/user-profile-category.tpl.php (100%) rename {modules => core/modules}/user/user-profile-item.tpl.php (100%) rename {modules => core/modules}/user/user-profile.tpl.php (100%) rename {modules => core/modules}/user/user-rtl.css (100%) rename {modules => core/modules}/user/user.admin.inc (100%) rename {modules => core/modules}/user/user.api.php (100%) rename {modules => core/modules}/user/user.css (100%) rename {modules => core/modules}/user/user.info (100%) rename {modules => core/modules}/user/user.install (100%) rename {modules => core/modules}/user/user.js (100%) rename {modules => core/modules}/user/user.module (100%) rename {modules => core/modules}/user/user.pages.inc (100%) rename {modules => core/modules}/user/user.permissions.js (100%) rename {modules => core/modules}/user/user.test (100%) rename {modules => core/modules}/user/user.tokens.inc (100%) rename {scripts => core/scripts}/code-clean.sh (100%) rename {scripts => core/scripts}/cron-curl.sh (100%) rename {scripts => core/scripts}/cron-lynx.sh (100%) rename {scripts => core/scripts}/drupal.sh (100%) rename {scripts => core/scripts}/dump-database-d6.sh (100%) rename {scripts => core/scripts}/generate-d6-content.sh (100%) rename {scripts => core/scripts}/password-hash.sh (100%) rename {scripts => core/scripts}/run-tests.sh (100%) rename {themes => core/themes}/README.txt (100%) rename {themes => core/themes}/bartik/bartik.info (100%) rename {themes => core/themes}/bartik/color/base.png (100%) rename {themes => core/themes}/bartik/color/color.inc (100%) rename {themes => core/themes}/bartik/color/preview.css (100%) rename {themes => core/themes}/bartik/color/preview.html (100%) rename {themes => core/themes}/bartik/color/preview.js (100%) rename {themes => core/themes}/bartik/color/preview.png (100%) rename {themes => core/themes}/bartik/css/colors.css (100%) rename {themes => core/themes}/bartik/css/ie-rtl.css (100%) rename {themes => core/themes}/bartik/css/ie.css (100%) rename {themes => core/themes}/bartik/css/ie6.css (100%) rename {themes => core/themes}/bartik/css/layout-rtl.css (100%) rename {themes => core/themes}/bartik/css/layout.css (100%) rename {themes => core/themes}/bartik/css/maintenance-page.css (100%) rename {themes => core/themes}/bartik/css/print.css (100%) rename {themes => core/themes}/bartik/css/style-rtl.css (100%) rename {themes => core/themes}/bartik/css/style.css (100%) rename {themes => core/themes}/bartik/images/add.png (100%) rename {themes => core/themes}/bartik/images/buttons.png (100%) rename {themes => core/themes}/bartik/images/comment-arrow-rtl.gif (100%) rename {themes => core/themes}/bartik/images/comment-arrow.gif (100%) rename {themes => core/themes}/bartik/images/search-button.png (100%) rename {themes => core/themes}/bartik/images/tabs-border.png (100%) rename {themes => core/themes}/bartik/logo.png (100%) rename {themes => core/themes}/bartik/screenshot.png (100%) rename {themes => core/themes}/bartik/template.php (100%) rename {themes => core/themes}/bartik/templates/comment-wrapper.tpl.php (100%) rename {themes => core/themes}/bartik/templates/comment.tpl.php (100%) rename {themes => core/themes}/bartik/templates/maintenance-page.tpl.php (100%) rename {themes => core/themes}/bartik/templates/node.tpl.php (100%) rename {themes => core/themes}/bartik/templates/page.tpl.php (100%) rename {themes => core/themes}/engines/phptemplate/phptemplate.engine (100%) rename {themes => core/themes}/garland/color/base.png (100%) rename {themes => core/themes}/garland/color/color.inc (100%) rename {themes => core/themes}/garland/color/preview.css (100%) rename {themes => core/themes}/garland/color/preview.png (100%) rename {themes => core/themes}/garland/comment.tpl.php (100%) rename {themes => core/themes}/garland/fix-ie-rtl.css (100%) rename {themes => core/themes}/garland/fix-ie.css (100%) rename {themes => core/themes}/garland/garland.info (100%) rename {themes => core/themes}/garland/images/bg-bar-white.png (100%) rename {themes => core/themes}/garland/images/bg-bar.png (100%) rename {themes => core/themes}/garland/images/bg-content-left.png (100%) rename {themes => core/themes}/garland/images/bg-content-right.png (100%) rename {themes => core/themes}/garland/images/bg-content.png (100%) rename {themes => core/themes}/garland/images/bg-navigation-item-hover.png (100%) rename {themes => core/themes}/garland/images/bg-navigation-item.png (100%) rename {themes => core/themes}/garland/images/bg-navigation.png (100%) rename {themes => core/themes}/garland/images/bg-tab.png (100%) rename {themes => core/themes}/garland/images/body.png (100%) rename {themes => core/themes}/garland/images/gradient-inner.png (100%) rename {themes => core/themes}/garland/images/menu-collapsed-rtl.gif (100%) rename {themes => core/themes}/garland/images/menu-collapsed.gif (100%) rename {themes => core/themes}/garland/images/menu-expanded.gif (100%) rename {themes => core/themes}/garland/images/menu-leaf.gif (100%) rename {themes => core/themes}/garland/images/task-list.png (100%) rename {themes => core/themes}/garland/logo.png (100%) rename {themes => core/themes}/garland/maintenance-page.tpl.php (100%) rename {themes => core/themes}/garland/node.tpl.php (100%) rename {themes => core/themes}/garland/page.tpl.php (100%) rename {themes => core/themes}/garland/print.css (100%) rename {themes => core/themes}/garland/screenshot.png (100%) rename {themes => core/themes}/garland/style-rtl.css (100%) rename {themes => core/themes}/garland/style.css (100%) rename {themes => core/themes}/garland/template.php (100%) rename {themes => core/themes}/garland/theme-settings.php (100%) rename {themes => core/themes}/seven/ie.css (100%) rename {themes => core/themes}/seven/ie6.css (100%) rename {themes => core/themes}/seven/images/add.png (100%) rename {themes => core/themes}/seven/images/arrow-asc.png (100%) rename {themes => core/themes}/seven/images/arrow-desc.png (100%) rename {themes => core/themes}/seven/images/arrow-next.png (100%) rename {themes => core/themes}/seven/images/arrow-prev.png (100%) rename {themes => core/themes}/seven/images/buttons.png (100%) rename {themes => core/themes}/seven/images/fc-rtl.png (100%) rename {themes => core/themes}/seven/images/fc.png (100%) rename {themes => core/themes}/seven/images/list-item.png (100%) rename {themes => core/themes}/seven/images/task-check.png (100%) rename {themes => core/themes}/seven/images/task-item.png (100%) rename {themes => core/themes}/seven/images/ui-icons-222222-256x240.png (100%) rename {themes => core/themes}/seven/images/ui-icons-454545-256x240.png (100%) rename {themes => core/themes}/seven/images/ui-icons-800000-256x240.png (100%) rename {themes => core/themes}/seven/images/ui-icons-888888-256x240.png (100%) rename {themes => core/themes}/seven/images/ui-icons-ffffff-256x240.png (100%) rename {themes => core/themes}/seven/jquery.ui.theme.css (100%) rename {themes => core/themes}/seven/logo.png (100%) rename {themes => core/themes}/seven/maintenance-page.tpl.php (100%) rename {themes => core/themes}/seven/page.tpl.php (100%) rename {themes => core/themes}/seven/reset.css (100%) rename {themes => core/themes}/seven/screenshot.png (100%) rename {themes => core/themes}/seven/seven.info (100%) rename {themes => core/themes}/seven/style-rtl.css (100%) rename {themes => core/themes}/seven/style.css (100%) rename {themes => core/themes}/seven/template.php (100%) rename {themes => core/themes}/seven/vertical-tabs-rtl.css (100%) rename {themes => core/themes}/seven/vertical-tabs.css (100%) rename {themes => core/themes}/stark/README.txt (100%) rename {themes => core/themes}/stark/layout.css (100%) rename {themes => core/themes}/stark/logo.png (100%) rename {themes => core/themes}/stark/screenshot.png (100%) rename {themes => core/themes}/stark/stark.info (100%) rename {themes => core/themes}/tests/README.txt (100%) rename {themes => core/themes}/tests/test_theme/template.php (100%) rename {themes => core/themes}/tests/test_theme/test_theme.info (100%) rename {themes => core/themes}/tests/update_test_basetheme/update_test_basetheme.info (100%) rename {themes => core/themes}/tests/update_test_subtheme/update_test_subtheme.info (100%) rename update.php => core/update.php (100%) rename xmlrpc.php => core/xmlrpc.php (100%) diff --git a/CHANGELOG.txt b/core/CHANGELOG.txt similarity index 100% rename from CHANGELOG.txt rename to core/CHANGELOG.txt diff --git a/COPYRIGHT.txt b/core/COPYRIGHT.txt similarity index 100% rename from COPYRIGHT.txt rename to core/COPYRIGHT.txt diff --git a/INSTALL.mysql.txt b/core/INSTALL.mysql.txt similarity index 100% rename from INSTALL.mysql.txt rename to core/INSTALL.mysql.txt diff --git a/INSTALL.pgsql.txt b/core/INSTALL.pgsql.txt similarity index 100% rename from INSTALL.pgsql.txt rename to core/INSTALL.pgsql.txt diff --git a/INSTALL.sqlite.txt b/core/INSTALL.sqlite.txt similarity index 100% rename from INSTALL.sqlite.txt rename to core/INSTALL.sqlite.txt diff --git a/INSTALL.txt b/core/INSTALL.txt similarity index 100% rename from INSTALL.txt rename to core/INSTALL.txt diff --git a/LICENSE.txt b/core/LICENSE.txt similarity index 100% rename from LICENSE.txt rename to core/LICENSE.txt diff --git a/MAINTAINERS.txt b/core/MAINTAINERS.txt similarity index 100% rename from MAINTAINERS.txt rename to core/MAINTAINERS.txt diff --git a/UPGRADE.txt b/core/UPGRADE.txt similarity index 100% rename from UPGRADE.txt rename to core/UPGRADE.txt diff --git a/authorize.php b/core/authorize.php similarity index 100% rename from authorize.php rename to core/authorize.php diff --git a/cron.php b/core/cron.php similarity index 100% rename from cron.php rename to core/cron.php diff --git a/includes/actions.inc b/core/includes/actions.inc similarity index 100% rename from includes/actions.inc rename to core/includes/actions.inc diff --git a/includes/ajax.inc b/core/includes/ajax.inc similarity index 100% rename from includes/ajax.inc rename to core/includes/ajax.inc diff --git a/includes/archiver.inc b/core/includes/archiver.inc similarity index 100% rename from includes/archiver.inc rename to core/includes/archiver.inc diff --git a/includes/authorize.inc b/core/includes/authorize.inc similarity index 100% rename from includes/authorize.inc rename to core/includes/authorize.inc diff --git a/includes/batch.inc b/core/includes/batch.inc similarity index 100% rename from includes/batch.inc rename to core/includes/batch.inc diff --git a/includes/batch.queue.inc b/core/includes/batch.queue.inc similarity index 100% rename from includes/batch.queue.inc rename to core/includes/batch.queue.inc diff --git a/includes/bootstrap.inc b/core/includes/bootstrap.inc similarity index 100% rename from includes/bootstrap.inc rename to core/includes/bootstrap.inc diff --git a/includes/cache-install.inc b/core/includes/cache-install.inc similarity index 100% rename from includes/cache-install.inc rename to core/includes/cache-install.inc diff --git a/includes/cache.inc b/core/includes/cache.inc similarity index 100% rename from includes/cache.inc rename to core/includes/cache.inc diff --git a/includes/common.inc b/core/includes/common.inc similarity index 100% rename from includes/common.inc rename to core/includes/common.inc diff --git a/includes/database/database.inc b/core/includes/database/database.inc similarity index 100% rename from includes/database/database.inc rename to core/includes/database/database.inc diff --git a/includes/database/log.inc b/core/includes/database/log.inc similarity index 100% rename from includes/database/log.inc rename to core/includes/database/log.inc diff --git a/includes/database/mysql/database.inc b/core/includes/database/mysql/database.inc similarity index 100% rename from includes/database/mysql/database.inc rename to core/includes/database/mysql/database.inc diff --git a/includes/database/mysql/install.inc b/core/includes/database/mysql/install.inc similarity index 100% rename from includes/database/mysql/install.inc rename to core/includes/database/mysql/install.inc diff --git a/includes/database/mysql/query.inc b/core/includes/database/mysql/query.inc similarity index 100% rename from includes/database/mysql/query.inc rename to core/includes/database/mysql/query.inc diff --git a/includes/database/mysql/schema.inc b/core/includes/database/mysql/schema.inc similarity index 100% rename from includes/database/mysql/schema.inc rename to core/includes/database/mysql/schema.inc diff --git a/includes/database/pgsql/database.inc b/core/includes/database/pgsql/database.inc similarity index 100% rename from includes/database/pgsql/database.inc rename to core/includes/database/pgsql/database.inc diff --git a/includes/database/pgsql/install.inc b/core/includes/database/pgsql/install.inc similarity index 100% rename from includes/database/pgsql/install.inc rename to core/includes/database/pgsql/install.inc diff --git a/includes/database/pgsql/query.inc b/core/includes/database/pgsql/query.inc similarity index 100% rename from includes/database/pgsql/query.inc rename to core/includes/database/pgsql/query.inc diff --git a/includes/database/pgsql/schema.inc b/core/includes/database/pgsql/schema.inc similarity index 100% rename from includes/database/pgsql/schema.inc rename to core/includes/database/pgsql/schema.inc diff --git a/includes/database/pgsql/select.inc b/core/includes/database/pgsql/select.inc similarity index 100% rename from includes/database/pgsql/select.inc rename to core/includes/database/pgsql/select.inc diff --git a/includes/database/prefetch.inc b/core/includes/database/prefetch.inc similarity index 100% rename from includes/database/prefetch.inc rename to core/includes/database/prefetch.inc diff --git a/includes/database/query.inc b/core/includes/database/query.inc similarity index 100% rename from includes/database/query.inc rename to core/includes/database/query.inc diff --git a/includes/database/schema.inc b/core/includes/database/schema.inc similarity index 100% rename from includes/database/schema.inc rename to core/includes/database/schema.inc diff --git a/includes/database/select.inc b/core/includes/database/select.inc similarity index 100% rename from includes/database/select.inc rename to core/includes/database/select.inc diff --git a/includes/database/sqlite/database.inc b/core/includes/database/sqlite/database.inc similarity index 100% rename from includes/database/sqlite/database.inc rename to core/includes/database/sqlite/database.inc diff --git a/includes/database/sqlite/install.inc b/core/includes/database/sqlite/install.inc similarity index 100% rename from includes/database/sqlite/install.inc rename to core/includes/database/sqlite/install.inc diff --git a/includes/database/sqlite/query.inc b/core/includes/database/sqlite/query.inc similarity index 100% rename from includes/database/sqlite/query.inc rename to core/includes/database/sqlite/query.inc diff --git a/includes/database/sqlite/schema.inc b/core/includes/database/sqlite/schema.inc similarity index 100% rename from includes/database/sqlite/schema.inc rename to core/includes/database/sqlite/schema.inc diff --git a/includes/database/sqlite/select.inc b/core/includes/database/sqlite/select.inc similarity index 100% rename from includes/database/sqlite/select.inc rename to core/includes/database/sqlite/select.inc diff --git a/includes/date.inc b/core/includes/date.inc similarity index 100% rename from includes/date.inc rename to core/includes/date.inc diff --git a/includes/entity.inc b/core/includes/entity.inc similarity index 100% rename from includes/entity.inc rename to core/includes/entity.inc diff --git a/includes/errors.inc b/core/includes/errors.inc similarity index 100% rename from includes/errors.inc rename to core/includes/errors.inc diff --git a/includes/file.inc b/core/includes/file.inc similarity index 100% rename from includes/file.inc rename to core/includes/file.inc diff --git a/includes/file.mimetypes.inc b/core/includes/file.mimetypes.inc similarity index 100% rename from includes/file.mimetypes.inc rename to core/includes/file.mimetypes.inc diff --git a/includes/filetransfer/filetransfer.inc b/core/includes/filetransfer/filetransfer.inc similarity index 100% rename from includes/filetransfer/filetransfer.inc rename to core/includes/filetransfer/filetransfer.inc diff --git a/includes/filetransfer/ftp.inc b/core/includes/filetransfer/ftp.inc similarity index 100% rename from includes/filetransfer/ftp.inc rename to core/includes/filetransfer/ftp.inc diff --git a/includes/filetransfer/local.inc b/core/includes/filetransfer/local.inc similarity index 100% rename from includes/filetransfer/local.inc rename to core/includes/filetransfer/local.inc diff --git a/includes/filetransfer/ssh.inc b/core/includes/filetransfer/ssh.inc similarity index 100% rename from includes/filetransfer/ssh.inc rename to core/includes/filetransfer/ssh.inc diff --git a/includes/form.inc b/core/includes/form.inc similarity index 100% rename from includes/form.inc rename to core/includes/form.inc diff --git a/includes/graph.inc b/core/includes/graph.inc similarity index 100% rename from includes/graph.inc rename to core/includes/graph.inc diff --git a/includes/image.inc b/core/includes/image.inc similarity index 100% rename from includes/image.inc rename to core/includes/image.inc diff --git a/includes/install.core.inc b/core/includes/install.core.inc similarity index 100% rename from includes/install.core.inc rename to core/includes/install.core.inc diff --git a/includes/install.inc b/core/includes/install.inc similarity index 100% rename from includes/install.inc rename to core/includes/install.inc diff --git a/includes/iso.inc b/core/includes/iso.inc similarity index 100% rename from includes/iso.inc rename to core/includes/iso.inc diff --git a/includes/language.inc b/core/includes/language.inc similarity index 100% rename from includes/language.inc rename to core/includes/language.inc diff --git a/includes/locale.inc b/core/includes/locale.inc similarity index 100% rename from includes/locale.inc rename to core/includes/locale.inc diff --git a/includes/lock.inc b/core/includes/lock.inc similarity index 100% rename from includes/lock.inc rename to core/includes/lock.inc diff --git a/includes/mail.inc b/core/includes/mail.inc similarity index 100% rename from includes/mail.inc rename to core/includes/mail.inc diff --git a/includes/menu.inc b/core/includes/menu.inc similarity index 100% rename from includes/menu.inc rename to core/includes/menu.inc diff --git a/includes/module.inc b/core/includes/module.inc similarity index 100% rename from includes/module.inc rename to core/includes/module.inc diff --git a/includes/pager.inc b/core/includes/pager.inc similarity index 100% rename from includes/pager.inc rename to core/includes/pager.inc diff --git a/includes/password.inc b/core/includes/password.inc similarity index 100% rename from includes/password.inc rename to core/includes/password.inc diff --git a/includes/path.inc b/core/includes/path.inc similarity index 100% rename from includes/path.inc rename to core/includes/path.inc diff --git a/includes/registry.inc b/core/includes/registry.inc similarity index 100% rename from includes/registry.inc rename to core/includes/registry.inc diff --git a/includes/session.inc b/core/includes/session.inc similarity index 100% rename from includes/session.inc rename to core/includes/session.inc diff --git a/includes/stream_wrappers.inc b/core/includes/stream_wrappers.inc similarity index 100% rename from includes/stream_wrappers.inc rename to core/includes/stream_wrappers.inc diff --git a/includes/tablesort.inc b/core/includes/tablesort.inc similarity index 100% rename from includes/tablesort.inc rename to core/includes/tablesort.inc diff --git a/includes/theme.inc b/core/includes/theme.inc similarity index 100% rename from includes/theme.inc rename to core/includes/theme.inc diff --git a/includes/theme.maintenance.inc b/core/includes/theme.maintenance.inc similarity index 100% rename from includes/theme.maintenance.inc rename to core/includes/theme.maintenance.inc diff --git a/includes/token.inc b/core/includes/token.inc similarity index 100% rename from includes/token.inc rename to core/includes/token.inc diff --git a/includes/unicode.entities.inc b/core/includes/unicode.entities.inc similarity index 100% rename from includes/unicode.entities.inc rename to core/includes/unicode.entities.inc diff --git a/includes/unicode.inc b/core/includes/unicode.inc similarity index 100% rename from includes/unicode.inc rename to core/includes/unicode.inc diff --git a/includes/update.inc b/core/includes/update.inc similarity index 100% rename from includes/update.inc rename to core/includes/update.inc diff --git a/includes/updater.inc b/core/includes/updater.inc similarity index 100% rename from includes/updater.inc rename to core/includes/updater.inc diff --git a/includes/utility.inc b/core/includes/utility.inc similarity index 100% rename from includes/utility.inc rename to core/includes/utility.inc diff --git a/includes/xmlrpc.inc b/core/includes/xmlrpc.inc similarity index 100% rename from includes/xmlrpc.inc rename to core/includes/xmlrpc.inc diff --git a/includes/xmlrpcs.inc b/core/includes/xmlrpcs.inc similarity index 100% rename from includes/xmlrpcs.inc rename to core/includes/xmlrpcs.inc diff --git a/install.php b/core/install.php similarity index 100% rename from install.php rename to core/install.php diff --git a/misc/ajax.js b/core/misc/ajax.js similarity index 100% rename from misc/ajax.js rename to core/misc/ajax.js diff --git a/misc/arrow-asc.png b/core/misc/arrow-asc.png similarity index 100% rename from misc/arrow-asc.png rename to core/misc/arrow-asc.png diff --git a/misc/arrow-desc.png b/core/misc/arrow-desc.png similarity index 100% rename from misc/arrow-desc.png rename to core/misc/arrow-desc.png diff --git a/misc/authorize.js b/core/misc/authorize.js similarity index 100% rename from misc/authorize.js rename to core/misc/authorize.js diff --git a/misc/autocomplete.js b/core/misc/autocomplete.js similarity index 100% rename from misc/autocomplete.js rename to core/misc/autocomplete.js diff --git a/misc/batch.js b/core/misc/batch.js similarity index 100% rename from misc/batch.js rename to core/misc/batch.js diff --git a/misc/collapse.js b/core/misc/collapse.js similarity index 100% rename from misc/collapse.js rename to core/misc/collapse.js diff --git a/misc/configure.png b/core/misc/configure.png similarity index 100% rename from misc/configure.png rename to core/misc/configure.png diff --git a/misc/draggable.png b/core/misc/draggable.png similarity index 100% rename from misc/draggable.png rename to core/misc/draggable.png diff --git a/misc/drupal.js b/core/misc/drupal.js similarity index 100% rename from misc/drupal.js rename to core/misc/drupal.js diff --git a/misc/druplicon.png b/core/misc/druplicon.png similarity index 100% rename from misc/druplicon.png rename to core/misc/druplicon.png diff --git a/misc/farbtastic/farbtastic.css b/core/misc/farbtastic/farbtastic.css similarity index 100% rename from misc/farbtastic/farbtastic.css rename to core/misc/farbtastic/farbtastic.css diff --git a/misc/farbtastic/farbtastic.js b/core/misc/farbtastic/farbtastic.js similarity index 100% rename from misc/farbtastic/farbtastic.js rename to core/misc/farbtastic/farbtastic.js diff --git a/misc/farbtastic/marker.png b/core/misc/farbtastic/marker.png similarity index 100% rename from misc/farbtastic/marker.png rename to core/misc/farbtastic/marker.png diff --git a/misc/farbtastic/mask.png b/core/misc/farbtastic/mask.png similarity index 100% rename from misc/farbtastic/mask.png rename to core/misc/farbtastic/mask.png diff --git a/misc/farbtastic/wheel.png b/core/misc/farbtastic/wheel.png similarity index 100% rename from misc/farbtastic/wheel.png rename to core/misc/farbtastic/wheel.png diff --git a/misc/favicon.ico b/core/misc/favicon.ico similarity index 100% rename from misc/favicon.ico rename to core/misc/favicon.ico diff --git a/misc/feed.png b/core/misc/feed.png similarity index 100% rename from misc/feed.png rename to core/misc/feed.png diff --git a/misc/form.js b/core/misc/form.js similarity index 100% rename from misc/form.js rename to core/misc/form.js diff --git a/misc/forum-icons.png b/core/misc/forum-icons.png similarity index 100% rename from misc/forum-icons.png rename to core/misc/forum-icons.png diff --git a/misc/grippie.png b/core/misc/grippie.png similarity index 100% rename from misc/grippie.png rename to core/misc/grippie.png diff --git a/misc/help.png b/core/misc/help.png similarity index 100% rename from misc/help.png rename to core/misc/help.png diff --git a/misc/jquery.ba-bbq.js b/core/misc/jquery.ba-bbq.js similarity index 100% rename from misc/jquery.ba-bbq.js rename to core/misc/jquery.ba-bbq.js diff --git a/misc/jquery.cookie.js b/core/misc/jquery.cookie.js similarity index 100% rename from misc/jquery.cookie.js rename to core/misc/jquery.cookie.js diff --git a/misc/jquery.form.js b/core/misc/jquery.form.js similarity index 100% rename from misc/jquery.form.js rename to core/misc/jquery.form.js diff --git a/misc/jquery.js b/core/misc/jquery.js similarity index 100% rename from misc/jquery.js rename to core/misc/jquery.js diff --git a/misc/jquery.once.js b/core/misc/jquery.once.js similarity index 100% rename from misc/jquery.once.js rename to core/misc/jquery.once.js diff --git a/misc/machine-name.js b/core/misc/machine-name.js similarity index 100% rename from misc/machine-name.js rename to core/misc/machine-name.js diff --git a/misc/menu-collapsed-rtl.png b/core/misc/menu-collapsed-rtl.png similarity index 100% rename from misc/menu-collapsed-rtl.png rename to core/misc/menu-collapsed-rtl.png diff --git a/misc/menu-collapsed.png b/core/misc/menu-collapsed.png similarity index 100% rename from misc/menu-collapsed.png rename to core/misc/menu-collapsed.png diff --git a/misc/menu-expanded.png b/core/misc/menu-expanded.png similarity index 100% rename from misc/menu-expanded.png rename to core/misc/menu-expanded.png diff --git a/misc/menu-leaf.png b/core/misc/menu-leaf.png similarity index 100% rename from misc/menu-leaf.png rename to core/misc/menu-leaf.png diff --git a/misc/message-16-error.png b/core/misc/message-16-error.png similarity index 100% rename from misc/message-16-error.png rename to core/misc/message-16-error.png diff --git a/misc/message-16-help.png b/core/misc/message-16-help.png similarity index 100% rename from misc/message-16-help.png rename to core/misc/message-16-help.png diff --git a/misc/message-16-info.png b/core/misc/message-16-info.png similarity index 100% rename from misc/message-16-info.png rename to core/misc/message-16-info.png diff --git a/misc/message-16-ok.png b/core/misc/message-16-ok.png similarity index 100% rename from misc/message-16-ok.png rename to core/misc/message-16-ok.png diff --git a/misc/message-16-warning.png b/core/misc/message-16-warning.png similarity index 100% rename from misc/message-16-warning.png rename to core/misc/message-16-warning.png diff --git a/misc/message-24-error.png b/core/misc/message-24-error.png similarity index 100% rename from misc/message-24-error.png rename to core/misc/message-24-error.png diff --git a/misc/message-24-help.png b/core/misc/message-24-help.png similarity index 100% rename from misc/message-24-help.png rename to core/misc/message-24-help.png diff --git a/misc/message-24-info.png b/core/misc/message-24-info.png similarity index 100% rename from misc/message-24-info.png rename to core/misc/message-24-info.png diff --git a/misc/message-24-ok.png b/core/misc/message-24-ok.png similarity index 100% rename from misc/message-24-ok.png rename to core/misc/message-24-ok.png diff --git a/misc/message-24-warning.png b/core/misc/message-24-warning.png similarity index 100% rename from misc/message-24-warning.png rename to core/misc/message-24-warning.png diff --git a/misc/permissions.png b/core/misc/permissions.png similarity index 100% rename from misc/permissions.png rename to core/misc/permissions.png diff --git a/misc/powered-black-135x42.png b/core/misc/powered-black-135x42.png similarity index 100% rename from misc/powered-black-135x42.png rename to core/misc/powered-black-135x42.png diff --git a/misc/powered-black-80x15.png b/core/misc/powered-black-80x15.png similarity index 100% rename from misc/powered-black-80x15.png rename to core/misc/powered-black-80x15.png diff --git a/misc/powered-black-88x31.png b/core/misc/powered-black-88x31.png similarity index 100% rename from misc/powered-black-88x31.png rename to core/misc/powered-black-88x31.png diff --git a/misc/powered-blue-135x42.png b/core/misc/powered-blue-135x42.png similarity index 100% rename from misc/powered-blue-135x42.png rename to core/misc/powered-blue-135x42.png diff --git a/misc/powered-blue-80x15.png b/core/misc/powered-blue-80x15.png similarity index 100% rename from misc/powered-blue-80x15.png rename to core/misc/powered-blue-80x15.png diff --git a/misc/powered-blue-88x31.png b/core/misc/powered-blue-88x31.png similarity index 100% rename from misc/powered-blue-88x31.png rename to core/misc/powered-blue-88x31.png diff --git a/misc/powered-gray-135x42.png b/core/misc/powered-gray-135x42.png similarity index 100% rename from misc/powered-gray-135x42.png rename to core/misc/powered-gray-135x42.png diff --git a/misc/powered-gray-80x15.png b/core/misc/powered-gray-80x15.png similarity index 100% rename from misc/powered-gray-80x15.png rename to core/misc/powered-gray-80x15.png diff --git a/misc/powered-gray-88x31.png b/core/misc/powered-gray-88x31.png similarity index 100% rename from misc/powered-gray-88x31.png rename to core/misc/powered-gray-88x31.png diff --git a/misc/print-rtl.css b/core/misc/print-rtl.css similarity index 100% rename from misc/print-rtl.css rename to core/misc/print-rtl.css diff --git a/misc/print.css b/core/misc/print.css similarity index 100% rename from misc/print.css rename to core/misc/print.css diff --git a/misc/progress.gif b/core/misc/progress.gif similarity index 100% rename from misc/progress.gif rename to core/misc/progress.gif diff --git a/misc/progress.js b/core/misc/progress.js similarity index 100% rename from misc/progress.js rename to core/misc/progress.js diff --git a/misc/states.js b/core/misc/states.js similarity index 100% rename from misc/states.js rename to core/misc/states.js diff --git a/misc/tabledrag.js b/core/misc/tabledrag.js similarity index 100% rename from misc/tabledrag.js rename to core/misc/tabledrag.js diff --git a/misc/tableheader.js b/core/misc/tableheader.js similarity index 100% rename from misc/tableheader.js rename to core/misc/tableheader.js diff --git a/misc/tableselect.js b/core/misc/tableselect.js similarity index 100% rename from misc/tableselect.js rename to core/misc/tableselect.js diff --git a/misc/textarea.js b/core/misc/textarea.js similarity index 100% rename from misc/textarea.js rename to core/misc/textarea.js diff --git a/misc/throbber.gif b/core/misc/throbber.gif similarity index 100% rename from misc/throbber.gif rename to core/misc/throbber.gif diff --git a/misc/timezone.js b/core/misc/timezone.js similarity index 100% rename from misc/timezone.js rename to core/misc/timezone.js diff --git a/misc/tree-bottom.png b/core/misc/tree-bottom.png similarity index 100% rename from misc/tree-bottom.png rename to core/misc/tree-bottom.png diff --git a/misc/tree.png b/core/misc/tree.png similarity index 100% rename from misc/tree.png rename to core/misc/tree.png diff --git a/misc/ui/images/ui-bg_flat_0_aaaaaa_40x100.png b/core/misc/ui/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from misc/ui/images/ui-bg_flat_0_aaaaaa_40x100.png rename to core/misc/ui/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/misc/ui/images/ui-bg_flat_75_ffffff_40x100.png b/core/misc/ui/images/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from misc/ui/images/ui-bg_flat_75_ffffff_40x100.png rename to core/misc/ui/images/ui-bg_flat_75_ffffff_40x100.png diff --git a/misc/ui/images/ui-bg_glass_55_fbf9ee_1x400.png b/core/misc/ui/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from misc/ui/images/ui-bg_glass_55_fbf9ee_1x400.png rename to core/misc/ui/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/misc/ui/images/ui-bg_glass_65_ffffff_1x400.png b/core/misc/ui/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from misc/ui/images/ui-bg_glass_65_ffffff_1x400.png rename to core/misc/ui/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/misc/ui/images/ui-bg_glass_75_dadada_1x400.png b/core/misc/ui/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from misc/ui/images/ui-bg_glass_75_dadada_1x400.png rename to core/misc/ui/images/ui-bg_glass_75_dadada_1x400.png diff --git a/misc/ui/images/ui-bg_glass_75_e6e6e6_1x400.png b/core/misc/ui/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from misc/ui/images/ui-bg_glass_75_e6e6e6_1x400.png rename to core/misc/ui/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/misc/ui/images/ui-bg_glass_95_fef1ec_1x400.png b/core/misc/ui/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from misc/ui/images/ui-bg_glass_95_fef1ec_1x400.png rename to core/misc/ui/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/misc/ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/core/misc/ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from misc/ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to core/misc/ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/misc/ui/images/ui-icons_222222_256x240.png b/core/misc/ui/images/ui-icons_222222_256x240.png similarity index 100% rename from misc/ui/images/ui-icons_222222_256x240.png rename to core/misc/ui/images/ui-icons_222222_256x240.png diff --git a/misc/ui/images/ui-icons_2e83ff_256x240.png b/core/misc/ui/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from misc/ui/images/ui-icons_2e83ff_256x240.png rename to core/misc/ui/images/ui-icons_2e83ff_256x240.png diff --git a/misc/ui/images/ui-icons_454545_256x240.png b/core/misc/ui/images/ui-icons_454545_256x240.png similarity index 100% rename from misc/ui/images/ui-icons_454545_256x240.png rename to core/misc/ui/images/ui-icons_454545_256x240.png diff --git a/misc/ui/images/ui-icons_888888_256x240.png b/core/misc/ui/images/ui-icons_888888_256x240.png similarity index 100% rename from misc/ui/images/ui-icons_888888_256x240.png rename to core/misc/ui/images/ui-icons_888888_256x240.png diff --git a/misc/ui/images/ui-icons_cd0a0a_256x240.png b/core/misc/ui/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from misc/ui/images/ui-icons_cd0a0a_256x240.png rename to core/misc/ui/images/ui-icons_cd0a0a_256x240.png diff --git a/misc/ui/jquery.effects.blind.min.js b/core/misc/ui/jquery.effects.blind.min.js similarity index 100% rename from misc/ui/jquery.effects.blind.min.js rename to core/misc/ui/jquery.effects.blind.min.js diff --git a/misc/ui/jquery.effects.bounce.min.js b/core/misc/ui/jquery.effects.bounce.min.js similarity index 100% rename from misc/ui/jquery.effects.bounce.min.js rename to core/misc/ui/jquery.effects.bounce.min.js diff --git a/misc/ui/jquery.effects.clip.min.js b/core/misc/ui/jquery.effects.clip.min.js similarity index 100% rename from misc/ui/jquery.effects.clip.min.js rename to core/misc/ui/jquery.effects.clip.min.js diff --git a/misc/ui/jquery.effects.core.min.js b/core/misc/ui/jquery.effects.core.min.js similarity index 100% rename from misc/ui/jquery.effects.core.min.js rename to core/misc/ui/jquery.effects.core.min.js diff --git a/misc/ui/jquery.effects.drop.min.js b/core/misc/ui/jquery.effects.drop.min.js similarity index 100% rename from misc/ui/jquery.effects.drop.min.js rename to core/misc/ui/jquery.effects.drop.min.js diff --git a/misc/ui/jquery.effects.explode.min.js b/core/misc/ui/jquery.effects.explode.min.js similarity index 100% rename from misc/ui/jquery.effects.explode.min.js rename to core/misc/ui/jquery.effects.explode.min.js diff --git a/misc/ui/jquery.effects.fade.min.js b/core/misc/ui/jquery.effects.fade.min.js similarity index 100% rename from misc/ui/jquery.effects.fade.min.js rename to core/misc/ui/jquery.effects.fade.min.js diff --git a/misc/ui/jquery.effects.fold.min.js b/core/misc/ui/jquery.effects.fold.min.js similarity index 100% rename from misc/ui/jquery.effects.fold.min.js rename to core/misc/ui/jquery.effects.fold.min.js diff --git a/misc/ui/jquery.effects.highlight.min.js b/core/misc/ui/jquery.effects.highlight.min.js similarity index 100% rename from misc/ui/jquery.effects.highlight.min.js rename to core/misc/ui/jquery.effects.highlight.min.js diff --git a/misc/ui/jquery.effects.pulsate.min.js b/core/misc/ui/jquery.effects.pulsate.min.js similarity index 100% rename from misc/ui/jquery.effects.pulsate.min.js rename to core/misc/ui/jquery.effects.pulsate.min.js diff --git a/misc/ui/jquery.effects.scale.min.js b/core/misc/ui/jquery.effects.scale.min.js similarity index 100% rename from misc/ui/jquery.effects.scale.min.js rename to core/misc/ui/jquery.effects.scale.min.js diff --git a/misc/ui/jquery.effects.shake.min.js b/core/misc/ui/jquery.effects.shake.min.js similarity index 100% rename from misc/ui/jquery.effects.shake.min.js rename to core/misc/ui/jquery.effects.shake.min.js diff --git a/misc/ui/jquery.effects.slide.min.js b/core/misc/ui/jquery.effects.slide.min.js similarity index 100% rename from misc/ui/jquery.effects.slide.min.js rename to core/misc/ui/jquery.effects.slide.min.js diff --git a/misc/ui/jquery.effects.transfer.min.js b/core/misc/ui/jquery.effects.transfer.min.js similarity index 100% rename from misc/ui/jquery.effects.transfer.min.js rename to core/misc/ui/jquery.effects.transfer.min.js diff --git a/misc/ui/jquery.ui.accordion.css b/core/misc/ui/jquery.ui.accordion.css similarity index 100% rename from misc/ui/jquery.ui.accordion.css rename to core/misc/ui/jquery.ui.accordion.css diff --git a/misc/ui/jquery.ui.accordion.min.js b/core/misc/ui/jquery.ui.accordion.min.js similarity index 100% rename from misc/ui/jquery.ui.accordion.min.js rename to core/misc/ui/jquery.ui.accordion.min.js diff --git a/misc/ui/jquery.ui.autocomplete.css b/core/misc/ui/jquery.ui.autocomplete.css similarity index 100% rename from misc/ui/jquery.ui.autocomplete.css rename to core/misc/ui/jquery.ui.autocomplete.css diff --git a/misc/ui/jquery.ui.autocomplete.min.js b/core/misc/ui/jquery.ui.autocomplete.min.js similarity index 100% rename from misc/ui/jquery.ui.autocomplete.min.js rename to core/misc/ui/jquery.ui.autocomplete.min.js diff --git a/misc/ui/jquery.ui.button.css b/core/misc/ui/jquery.ui.button.css similarity index 100% rename from misc/ui/jquery.ui.button.css rename to core/misc/ui/jquery.ui.button.css diff --git a/misc/ui/jquery.ui.button.min.js b/core/misc/ui/jquery.ui.button.min.js similarity index 100% rename from misc/ui/jquery.ui.button.min.js rename to core/misc/ui/jquery.ui.button.min.js diff --git a/misc/ui/jquery.ui.core.css b/core/misc/ui/jquery.ui.core.css similarity index 100% rename from misc/ui/jquery.ui.core.css rename to core/misc/ui/jquery.ui.core.css diff --git a/misc/ui/jquery.ui.core.min.js b/core/misc/ui/jquery.ui.core.min.js similarity index 100% rename from misc/ui/jquery.ui.core.min.js rename to core/misc/ui/jquery.ui.core.min.js diff --git a/misc/ui/jquery.ui.datepicker.css b/core/misc/ui/jquery.ui.datepicker.css similarity index 100% rename from misc/ui/jquery.ui.datepicker.css rename to core/misc/ui/jquery.ui.datepicker.css diff --git a/misc/ui/jquery.ui.datepicker.min.js b/core/misc/ui/jquery.ui.datepicker.min.js similarity index 100% rename from misc/ui/jquery.ui.datepicker.min.js rename to core/misc/ui/jquery.ui.datepicker.min.js diff --git a/misc/ui/jquery.ui.dialog.css b/core/misc/ui/jquery.ui.dialog.css similarity index 100% rename from misc/ui/jquery.ui.dialog.css rename to core/misc/ui/jquery.ui.dialog.css diff --git a/misc/ui/jquery.ui.dialog.min.js b/core/misc/ui/jquery.ui.dialog.min.js similarity index 100% rename from misc/ui/jquery.ui.dialog.min.js rename to core/misc/ui/jquery.ui.dialog.min.js diff --git a/misc/ui/jquery.ui.draggable.min.js b/core/misc/ui/jquery.ui.draggable.min.js similarity index 100% rename from misc/ui/jquery.ui.draggable.min.js rename to core/misc/ui/jquery.ui.draggable.min.js diff --git a/misc/ui/jquery.ui.droppable.min.js b/core/misc/ui/jquery.ui.droppable.min.js similarity index 100% rename from misc/ui/jquery.ui.droppable.min.js rename to core/misc/ui/jquery.ui.droppable.min.js diff --git a/misc/ui/jquery.ui.mouse.min.js b/core/misc/ui/jquery.ui.mouse.min.js similarity index 100% rename from misc/ui/jquery.ui.mouse.min.js rename to core/misc/ui/jquery.ui.mouse.min.js diff --git a/misc/ui/jquery.ui.position.min.js b/core/misc/ui/jquery.ui.position.min.js similarity index 100% rename from misc/ui/jquery.ui.position.min.js rename to core/misc/ui/jquery.ui.position.min.js diff --git a/misc/ui/jquery.ui.progressbar.css b/core/misc/ui/jquery.ui.progressbar.css similarity index 100% rename from misc/ui/jquery.ui.progressbar.css rename to core/misc/ui/jquery.ui.progressbar.css diff --git a/misc/ui/jquery.ui.progressbar.min.js b/core/misc/ui/jquery.ui.progressbar.min.js similarity index 100% rename from misc/ui/jquery.ui.progressbar.min.js rename to core/misc/ui/jquery.ui.progressbar.min.js diff --git a/misc/ui/jquery.ui.resizable.css b/core/misc/ui/jquery.ui.resizable.css similarity index 100% rename from misc/ui/jquery.ui.resizable.css rename to core/misc/ui/jquery.ui.resizable.css diff --git a/misc/ui/jquery.ui.resizable.min.js b/core/misc/ui/jquery.ui.resizable.min.js similarity index 100% rename from misc/ui/jquery.ui.resizable.min.js rename to core/misc/ui/jquery.ui.resizable.min.js diff --git a/misc/ui/jquery.ui.selectable.css b/core/misc/ui/jquery.ui.selectable.css similarity index 100% rename from misc/ui/jquery.ui.selectable.css rename to core/misc/ui/jquery.ui.selectable.css diff --git a/misc/ui/jquery.ui.selectable.min.js b/core/misc/ui/jquery.ui.selectable.min.js similarity index 100% rename from misc/ui/jquery.ui.selectable.min.js rename to core/misc/ui/jquery.ui.selectable.min.js diff --git a/misc/ui/jquery.ui.slider.css b/core/misc/ui/jquery.ui.slider.css similarity index 100% rename from misc/ui/jquery.ui.slider.css rename to core/misc/ui/jquery.ui.slider.css diff --git a/misc/ui/jquery.ui.slider.min.js b/core/misc/ui/jquery.ui.slider.min.js similarity index 100% rename from misc/ui/jquery.ui.slider.min.js rename to core/misc/ui/jquery.ui.slider.min.js diff --git a/misc/ui/jquery.ui.sortable.min.js b/core/misc/ui/jquery.ui.sortable.min.js similarity index 100% rename from misc/ui/jquery.ui.sortable.min.js rename to core/misc/ui/jquery.ui.sortable.min.js diff --git a/misc/ui/jquery.ui.tabs.css b/core/misc/ui/jquery.ui.tabs.css similarity index 100% rename from misc/ui/jquery.ui.tabs.css rename to core/misc/ui/jquery.ui.tabs.css diff --git a/misc/ui/jquery.ui.tabs.min.js b/core/misc/ui/jquery.ui.tabs.min.js similarity index 100% rename from misc/ui/jquery.ui.tabs.min.js rename to core/misc/ui/jquery.ui.tabs.min.js diff --git a/misc/ui/jquery.ui.theme.css b/core/misc/ui/jquery.ui.theme.css similarity index 100% rename from misc/ui/jquery.ui.theme.css rename to core/misc/ui/jquery.ui.theme.css diff --git a/misc/ui/jquery.ui.widget.min.js b/core/misc/ui/jquery.ui.widget.min.js similarity index 100% rename from misc/ui/jquery.ui.widget.min.js rename to core/misc/ui/jquery.ui.widget.min.js diff --git a/misc/vertical-tabs-rtl.css b/core/misc/vertical-tabs-rtl.css similarity index 100% rename from misc/vertical-tabs-rtl.css rename to core/misc/vertical-tabs-rtl.css diff --git a/misc/vertical-tabs.css b/core/misc/vertical-tabs.css similarity index 100% rename from misc/vertical-tabs.css rename to core/misc/vertical-tabs.css diff --git a/misc/vertical-tabs.js b/core/misc/vertical-tabs.js similarity index 100% rename from misc/vertical-tabs.js rename to core/misc/vertical-tabs.js diff --git a/misc/watchdog-error.png b/core/misc/watchdog-error.png similarity index 100% rename from misc/watchdog-error.png rename to core/misc/watchdog-error.png diff --git a/misc/watchdog-ok.png b/core/misc/watchdog-ok.png similarity index 100% rename from misc/watchdog-ok.png rename to core/misc/watchdog-ok.png diff --git a/misc/watchdog-warning.png b/core/misc/watchdog-warning.png similarity index 100% rename from misc/watchdog-warning.png rename to core/misc/watchdog-warning.png diff --git a/modules/README.txt b/core/modules/README.txt similarity index 100% rename from modules/README.txt rename to core/modules/README.txt diff --git a/modules/aggregator/aggregator-feed-source.tpl.php b/core/modules/aggregator/aggregator-feed-source.tpl.php similarity index 100% rename from modules/aggregator/aggregator-feed-source.tpl.php rename to core/modules/aggregator/aggregator-feed-source.tpl.php diff --git a/modules/aggregator/aggregator-item.tpl.php b/core/modules/aggregator/aggregator-item.tpl.php similarity index 100% rename from modules/aggregator/aggregator-item.tpl.php rename to core/modules/aggregator/aggregator-item.tpl.php diff --git a/modules/aggregator/aggregator-rtl.css b/core/modules/aggregator/aggregator-rtl.css similarity index 100% rename from modules/aggregator/aggregator-rtl.css rename to core/modules/aggregator/aggregator-rtl.css diff --git a/modules/aggregator/aggregator-summary-item.tpl.php b/core/modules/aggregator/aggregator-summary-item.tpl.php similarity index 100% rename from modules/aggregator/aggregator-summary-item.tpl.php rename to core/modules/aggregator/aggregator-summary-item.tpl.php diff --git a/modules/aggregator/aggregator-summary-items.tpl.php b/core/modules/aggregator/aggregator-summary-items.tpl.php similarity index 100% rename from modules/aggregator/aggregator-summary-items.tpl.php rename to core/modules/aggregator/aggregator-summary-items.tpl.php diff --git a/modules/aggregator/aggregator-wrapper.tpl.php b/core/modules/aggregator/aggregator-wrapper.tpl.php similarity index 100% rename from modules/aggregator/aggregator-wrapper.tpl.php rename to core/modules/aggregator/aggregator-wrapper.tpl.php diff --git a/modules/aggregator/aggregator.admin.inc b/core/modules/aggregator/aggregator.admin.inc similarity index 100% rename from modules/aggregator/aggregator.admin.inc rename to core/modules/aggregator/aggregator.admin.inc diff --git a/modules/aggregator/aggregator.api.php b/core/modules/aggregator/aggregator.api.php similarity index 100% rename from modules/aggregator/aggregator.api.php rename to core/modules/aggregator/aggregator.api.php diff --git a/modules/aggregator/aggregator.css b/core/modules/aggregator/aggregator.css similarity index 100% rename from modules/aggregator/aggregator.css rename to core/modules/aggregator/aggregator.css diff --git a/modules/aggregator/aggregator.fetcher.inc b/core/modules/aggregator/aggregator.fetcher.inc similarity index 100% rename from modules/aggregator/aggregator.fetcher.inc rename to core/modules/aggregator/aggregator.fetcher.inc diff --git a/modules/aggregator/aggregator.info b/core/modules/aggregator/aggregator.info similarity index 100% rename from modules/aggregator/aggregator.info rename to core/modules/aggregator/aggregator.info diff --git a/modules/aggregator/aggregator.install b/core/modules/aggregator/aggregator.install similarity index 100% rename from modules/aggregator/aggregator.install rename to core/modules/aggregator/aggregator.install diff --git a/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module similarity index 100% rename from modules/aggregator/aggregator.module rename to core/modules/aggregator/aggregator.module diff --git a/modules/aggregator/aggregator.pages.inc b/core/modules/aggregator/aggregator.pages.inc similarity index 100% rename from modules/aggregator/aggregator.pages.inc rename to core/modules/aggregator/aggregator.pages.inc diff --git a/modules/aggregator/aggregator.parser.inc b/core/modules/aggregator/aggregator.parser.inc similarity index 100% rename from modules/aggregator/aggregator.parser.inc rename to core/modules/aggregator/aggregator.parser.inc diff --git a/modules/aggregator/aggregator.processor.inc b/core/modules/aggregator/aggregator.processor.inc similarity index 100% rename from modules/aggregator/aggregator.processor.inc rename to core/modules/aggregator/aggregator.processor.inc diff --git a/modules/aggregator/aggregator.test b/core/modules/aggregator/aggregator.test similarity index 100% rename from modules/aggregator/aggregator.test rename to core/modules/aggregator/aggregator.test diff --git a/modules/aggregator/tests/aggregator_test.info b/core/modules/aggregator/tests/aggregator_test.info similarity index 100% rename from modules/aggregator/tests/aggregator_test.info rename to core/modules/aggregator/tests/aggregator_test.info diff --git a/modules/aggregator/tests/aggregator_test.module b/core/modules/aggregator/tests/aggregator_test.module similarity index 100% rename from modules/aggregator/tests/aggregator_test.module rename to core/modules/aggregator/tests/aggregator_test.module diff --git a/modules/aggregator/tests/aggregator_test_atom.xml b/core/modules/aggregator/tests/aggregator_test_atom.xml similarity index 100% rename from modules/aggregator/tests/aggregator_test_atom.xml rename to core/modules/aggregator/tests/aggregator_test_atom.xml diff --git a/modules/aggregator/tests/aggregator_test_rss091.xml b/core/modules/aggregator/tests/aggregator_test_rss091.xml similarity index 100% rename from modules/aggregator/tests/aggregator_test_rss091.xml rename to core/modules/aggregator/tests/aggregator_test_rss091.xml diff --git a/modules/block/block-admin-display-form.tpl.php b/core/modules/block/block-admin-display-form.tpl.php similarity index 100% rename from modules/block/block-admin-display-form.tpl.php rename to core/modules/block/block-admin-display-form.tpl.php diff --git a/modules/block/block.admin.inc b/core/modules/block/block.admin.inc similarity index 100% rename from modules/block/block.admin.inc rename to core/modules/block/block.admin.inc diff --git a/modules/block/block.api.php b/core/modules/block/block.api.php similarity index 100% rename from modules/block/block.api.php rename to core/modules/block/block.api.php diff --git a/modules/block/block.css b/core/modules/block/block.css similarity index 100% rename from modules/block/block.css rename to core/modules/block/block.css diff --git a/modules/block/block.info b/core/modules/block/block.info similarity index 100% rename from modules/block/block.info rename to core/modules/block/block.info diff --git a/modules/block/block.install b/core/modules/block/block.install similarity index 100% rename from modules/block/block.install rename to core/modules/block/block.install diff --git a/modules/block/block.js b/core/modules/block/block.js similarity index 100% rename from modules/block/block.js rename to core/modules/block/block.js diff --git a/modules/block/block.module b/core/modules/block/block.module similarity index 100% rename from modules/block/block.module rename to core/modules/block/block.module diff --git a/modules/block/block.test b/core/modules/block/block.test similarity index 100% rename from modules/block/block.test rename to core/modules/block/block.test diff --git a/modules/block/block.tpl.php b/core/modules/block/block.tpl.php similarity index 100% rename from modules/block/block.tpl.php rename to core/modules/block/block.tpl.php diff --git a/modules/block/tests/block_test.info b/core/modules/block/tests/block_test.info similarity index 100% rename from modules/block/tests/block_test.info rename to core/modules/block/tests/block_test.info diff --git a/modules/block/tests/block_test.module b/core/modules/block/tests/block_test.module similarity index 100% rename from modules/block/tests/block_test.module rename to core/modules/block/tests/block_test.module diff --git a/modules/blog/blog.info b/core/modules/blog/blog.info similarity index 100% rename from modules/blog/blog.info rename to core/modules/blog/blog.info diff --git a/modules/blog/blog.install b/core/modules/blog/blog.install similarity index 100% rename from modules/blog/blog.install rename to core/modules/blog/blog.install diff --git a/modules/blog/blog.module b/core/modules/blog/blog.module similarity index 100% rename from modules/blog/blog.module rename to core/modules/blog/blog.module diff --git a/modules/blog/blog.pages.inc b/core/modules/blog/blog.pages.inc similarity index 100% rename from modules/blog/blog.pages.inc rename to core/modules/blog/blog.pages.inc diff --git a/modules/blog/blog.test b/core/modules/blog/blog.test similarity index 100% rename from modules/blog/blog.test rename to core/modules/blog/blog.test diff --git a/modules/book/book-all-books-block.tpl.php b/core/modules/book/book-all-books-block.tpl.php similarity index 100% rename from modules/book/book-all-books-block.tpl.php rename to core/modules/book/book-all-books-block.tpl.php diff --git a/modules/book/book-export-html.tpl.php b/core/modules/book/book-export-html.tpl.php similarity index 100% rename from modules/book/book-export-html.tpl.php rename to core/modules/book/book-export-html.tpl.php diff --git a/modules/book/book-navigation.tpl.php b/core/modules/book/book-navigation.tpl.php similarity index 100% rename from modules/book/book-navigation.tpl.php rename to core/modules/book/book-navigation.tpl.php diff --git a/modules/book/book-node-export-html.tpl.php b/core/modules/book/book-node-export-html.tpl.php similarity index 100% rename from modules/book/book-node-export-html.tpl.php rename to core/modules/book/book-node-export-html.tpl.php diff --git a/modules/book/book-rtl.css b/core/modules/book/book-rtl.css similarity index 100% rename from modules/book/book-rtl.css rename to core/modules/book/book-rtl.css diff --git a/modules/book/book.admin.inc b/core/modules/book/book.admin.inc similarity index 100% rename from modules/book/book.admin.inc rename to core/modules/book/book.admin.inc diff --git a/modules/book/book.css b/core/modules/book/book.css similarity index 100% rename from modules/book/book.css rename to core/modules/book/book.css diff --git a/modules/book/book.info b/core/modules/book/book.info similarity index 100% rename from modules/book/book.info rename to core/modules/book/book.info diff --git a/modules/book/book.install b/core/modules/book/book.install similarity index 100% rename from modules/book/book.install rename to core/modules/book/book.install diff --git a/modules/book/book.js b/core/modules/book/book.js similarity index 100% rename from modules/book/book.js rename to core/modules/book/book.js diff --git a/modules/book/book.module b/core/modules/book/book.module similarity index 100% rename from modules/book/book.module rename to core/modules/book/book.module diff --git a/modules/book/book.pages.inc b/core/modules/book/book.pages.inc similarity index 100% rename from modules/book/book.pages.inc rename to core/modules/book/book.pages.inc diff --git a/modules/book/book.test b/core/modules/book/book.test similarity index 100% rename from modules/book/book.test rename to core/modules/book/book.test diff --git a/modules/color/color-rtl.css b/core/modules/color/color-rtl.css similarity index 100% rename from modules/color/color-rtl.css rename to core/modules/color/color-rtl.css diff --git a/modules/color/color.css b/core/modules/color/color.css similarity index 100% rename from modules/color/color.css rename to core/modules/color/color.css diff --git a/modules/color/color.info b/core/modules/color/color.info similarity index 100% rename from modules/color/color.info rename to core/modules/color/color.info diff --git a/modules/color/color.install b/core/modules/color/color.install similarity index 100% rename from modules/color/color.install rename to core/modules/color/color.install diff --git a/modules/color/color.js b/core/modules/color/color.js similarity index 100% rename from modules/color/color.js rename to core/modules/color/color.js diff --git a/modules/color/color.module b/core/modules/color/color.module similarity index 100% rename from modules/color/color.module rename to core/modules/color/color.module diff --git a/modules/color/color.test b/core/modules/color/color.test similarity index 100% rename from modules/color/color.test rename to core/modules/color/color.test diff --git a/modules/color/images/hook-rtl.png b/core/modules/color/images/hook-rtl.png similarity index 100% rename from modules/color/images/hook-rtl.png rename to core/modules/color/images/hook-rtl.png diff --git a/modules/color/images/hook.png b/core/modules/color/images/hook.png similarity index 100% rename from modules/color/images/hook.png rename to core/modules/color/images/hook.png diff --git a/modules/color/images/lock.png b/core/modules/color/images/lock.png similarity index 100% rename from modules/color/images/lock.png rename to core/modules/color/images/lock.png diff --git a/modules/color/preview.html b/core/modules/color/preview.html similarity index 100% rename from modules/color/preview.html rename to core/modules/color/preview.html diff --git a/modules/color/preview.js b/core/modules/color/preview.js similarity index 100% rename from modules/color/preview.js rename to core/modules/color/preview.js diff --git a/modules/comment/comment-node-form.js b/core/modules/comment/comment-node-form.js similarity index 100% rename from modules/comment/comment-node-form.js rename to core/modules/comment/comment-node-form.js diff --git a/modules/comment/comment-rtl.css b/core/modules/comment/comment-rtl.css similarity index 100% rename from modules/comment/comment-rtl.css rename to core/modules/comment/comment-rtl.css diff --git a/modules/comment/comment-wrapper.tpl.php b/core/modules/comment/comment-wrapper.tpl.php similarity index 100% rename from modules/comment/comment-wrapper.tpl.php rename to core/modules/comment/comment-wrapper.tpl.php diff --git a/modules/comment/comment.admin.inc b/core/modules/comment/comment.admin.inc similarity index 100% rename from modules/comment/comment.admin.inc rename to core/modules/comment/comment.admin.inc diff --git a/modules/comment/comment.api.php b/core/modules/comment/comment.api.php similarity index 100% rename from modules/comment/comment.api.php rename to core/modules/comment/comment.api.php diff --git a/modules/comment/comment.css b/core/modules/comment/comment.css similarity index 100% rename from modules/comment/comment.css rename to core/modules/comment/comment.css diff --git a/modules/comment/comment.info b/core/modules/comment/comment.info similarity index 100% rename from modules/comment/comment.info rename to core/modules/comment/comment.info diff --git a/modules/comment/comment.install b/core/modules/comment/comment.install similarity index 100% rename from modules/comment/comment.install rename to core/modules/comment/comment.install diff --git a/modules/comment/comment.module b/core/modules/comment/comment.module similarity index 100% rename from modules/comment/comment.module rename to core/modules/comment/comment.module diff --git a/modules/comment/comment.pages.inc b/core/modules/comment/comment.pages.inc similarity index 100% rename from modules/comment/comment.pages.inc rename to core/modules/comment/comment.pages.inc diff --git a/modules/comment/comment.test b/core/modules/comment/comment.test similarity index 100% rename from modules/comment/comment.test rename to core/modules/comment/comment.test diff --git a/modules/comment/comment.tokens.inc b/core/modules/comment/comment.tokens.inc similarity index 100% rename from modules/comment/comment.tokens.inc rename to core/modules/comment/comment.tokens.inc diff --git a/modules/comment/comment.tpl.php b/core/modules/comment/comment.tpl.php similarity index 100% rename from modules/comment/comment.tpl.php rename to core/modules/comment/comment.tpl.php diff --git a/modules/contact/contact.admin.inc b/core/modules/contact/contact.admin.inc similarity index 100% rename from modules/contact/contact.admin.inc rename to core/modules/contact/contact.admin.inc diff --git a/modules/contact/contact.info b/core/modules/contact/contact.info similarity index 100% rename from modules/contact/contact.info rename to core/modules/contact/contact.info diff --git a/modules/contact/contact.install b/core/modules/contact/contact.install similarity index 100% rename from modules/contact/contact.install rename to core/modules/contact/contact.install diff --git a/modules/contact/contact.module b/core/modules/contact/contact.module similarity index 100% rename from modules/contact/contact.module rename to core/modules/contact/contact.module diff --git a/modules/contact/contact.pages.inc b/core/modules/contact/contact.pages.inc similarity index 100% rename from modules/contact/contact.pages.inc rename to core/modules/contact/contact.pages.inc diff --git a/modules/contact/contact.test b/core/modules/contact/contact.test similarity index 100% rename from modules/contact/contact.test rename to core/modules/contact/contact.test diff --git a/modules/contextual/contextual-rtl.css b/core/modules/contextual/contextual-rtl.css similarity index 100% rename from modules/contextual/contextual-rtl.css rename to core/modules/contextual/contextual-rtl.css diff --git a/modules/contextual/contextual.api.php b/core/modules/contextual/contextual.api.php similarity index 100% rename from modules/contextual/contextual.api.php rename to core/modules/contextual/contextual.api.php diff --git a/modules/contextual/contextual.css b/core/modules/contextual/contextual.css similarity index 100% rename from modules/contextual/contextual.css rename to core/modules/contextual/contextual.css diff --git a/modules/contextual/contextual.info b/core/modules/contextual/contextual.info similarity index 100% rename from modules/contextual/contextual.info rename to core/modules/contextual/contextual.info diff --git a/modules/contextual/contextual.js b/core/modules/contextual/contextual.js similarity index 100% rename from modules/contextual/contextual.js rename to core/modules/contextual/contextual.js diff --git a/modules/contextual/contextual.module b/core/modules/contextual/contextual.module similarity index 100% rename from modules/contextual/contextual.module rename to core/modules/contextual/contextual.module diff --git a/modules/contextual/images/gear-select.png b/core/modules/contextual/images/gear-select.png similarity index 100% rename from modules/contextual/images/gear-select.png rename to core/modules/contextual/images/gear-select.png diff --git a/modules/dashboard/dashboard.api.php b/core/modules/dashboard/dashboard.api.php similarity index 100% rename from modules/dashboard/dashboard.api.php rename to core/modules/dashboard/dashboard.api.php diff --git a/modules/dashboard/dashboard.css b/core/modules/dashboard/dashboard.css similarity index 100% rename from modules/dashboard/dashboard.css rename to core/modules/dashboard/dashboard.css diff --git a/modules/dashboard/dashboard.info b/core/modules/dashboard/dashboard.info similarity index 100% rename from modules/dashboard/dashboard.info rename to core/modules/dashboard/dashboard.info diff --git a/modules/dashboard/dashboard.install b/core/modules/dashboard/dashboard.install similarity index 100% rename from modules/dashboard/dashboard.install rename to core/modules/dashboard/dashboard.install diff --git a/modules/dashboard/dashboard.js b/core/modules/dashboard/dashboard.js similarity index 100% rename from modules/dashboard/dashboard.js rename to core/modules/dashboard/dashboard.js diff --git a/modules/dashboard/dashboard.module b/core/modules/dashboard/dashboard.module similarity index 100% rename from modules/dashboard/dashboard.module rename to core/modules/dashboard/dashboard.module diff --git a/modules/dashboard/dashboard.test b/core/modules/dashboard/dashboard.test similarity index 100% rename from modules/dashboard/dashboard.test rename to core/modules/dashboard/dashboard.test diff --git a/modules/dblog/dblog-rtl.css b/core/modules/dblog/dblog-rtl.css similarity index 100% rename from modules/dblog/dblog-rtl.css rename to core/modules/dblog/dblog-rtl.css diff --git a/modules/dblog/dblog.admin.inc b/core/modules/dblog/dblog.admin.inc similarity index 100% rename from modules/dblog/dblog.admin.inc rename to core/modules/dblog/dblog.admin.inc diff --git a/modules/dblog/dblog.css b/core/modules/dblog/dblog.css similarity index 100% rename from modules/dblog/dblog.css rename to core/modules/dblog/dblog.css diff --git a/modules/dblog/dblog.info b/core/modules/dblog/dblog.info similarity index 100% rename from modules/dblog/dblog.info rename to core/modules/dblog/dblog.info diff --git a/modules/dblog/dblog.install b/core/modules/dblog/dblog.install similarity index 100% rename from modules/dblog/dblog.install rename to core/modules/dblog/dblog.install diff --git a/modules/dblog/dblog.module b/core/modules/dblog/dblog.module similarity index 100% rename from modules/dblog/dblog.module rename to core/modules/dblog/dblog.module diff --git a/modules/dblog/dblog.test b/core/modules/dblog/dblog.test similarity index 100% rename from modules/dblog/dblog.test rename to core/modules/dblog/dblog.test diff --git a/modules/field/field.api.php b/core/modules/field/field.api.php similarity index 100% rename from modules/field/field.api.php rename to core/modules/field/field.api.php diff --git a/modules/field/field.attach.inc b/core/modules/field/field.attach.inc similarity index 100% rename from modules/field/field.attach.inc rename to core/modules/field/field.attach.inc diff --git a/modules/field/field.crud.inc b/core/modules/field/field.crud.inc similarity index 100% rename from modules/field/field.crud.inc rename to core/modules/field/field.crud.inc diff --git a/modules/field/field.default.inc b/core/modules/field/field.default.inc similarity index 100% rename from modules/field/field.default.inc rename to core/modules/field/field.default.inc diff --git a/modules/field/field.form.inc b/core/modules/field/field.form.inc similarity index 100% rename from modules/field/field.form.inc rename to core/modules/field/field.form.inc diff --git a/modules/field/field.info b/core/modules/field/field.info similarity index 100% rename from modules/field/field.info rename to core/modules/field/field.info diff --git a/modules/field/field.info.inc b/core/modules/field/field.info.inc similarity index 100% rename from modules/field/field.info.inc rename to core/modules/field/field.info.inc diff --git a/modules/field/field.install b/core/modules/field/field.install similarity index 100% rename from modules/field/field.install rename to core/modules/field/field.install diff --git a/modules/field/field.module b/core/modules/field/field.module similarity index 100% rename from modules/field/field.module rename to core/modules/field/field.module diff --git a/modules/field/field.multilingual.inc b/core/modules/field/field.multilingual.inc similarity index 100% rename from modules/field/field.multilingual.inc rename to core/modules/field/field.multilingual.inc diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.info b/core/modules/field/modules/field_sql_storage/field_sql_storage.info similarity index 100% rename from modules/field/modules/field_sql_storage/field_sql_storage.info rename to core/modules/field/modules/field_sql_storage/field_sql_storage.info diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.install b/core/modules/field/modules/field_sql_storage/field_sql_storage.install similarity index 100% rename from modules/field/modules/field_sql_storage/field_sql_storage.install rename to core/modules/field/modules/field_sql_storage/field_sql_storage.install diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.module b/core/modules/field/modules/field_sql_storage/field_sql_storage.module similarity index 100% rename from modules/field/modules/field_sql_storage/field_sql_storage.module rename to core/modules/field/modules/field_sql_storage/field_sql_storage.module diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.test b/core/modules/field/modules/field_sql_storage/field_sql_storage.test similarity index 100% rename from modules/field/modules/field_sql_storage/field_sql_storage.test rename to core/modules/field/modules/field_sql_storage/field_sql_storage.test diff --git a/modules/field/modules/list/list.info b/core/modules/field/modules/list/list.info similarity index 100% rename from modules/field/modules/list/list.info rename to core/modules/field/modules/list/list.info diff --git a/modules/field/modules/list/list.install b/core/modules/field/modules/list/list.install similarity index 100% rename from modules/field/modules/list/list.install rename to core/modules/field/modules/list/list.install diff --git a/modules/field/modules/list/list.module b/core/modules/field/modules/list/list.module similarity index 100% rename from modules/field/modules/list/list.module rename to core/modules/field/modules/list/list.module diff --git a/modules/field/modules/list/tests/list.test b/core/modules/field/modules/list/tests/list.test similarity index 100% rename from modules/field/modules/list/tests/list.test rename to core/modules/field/modules/list/tests/list.test diff --git a/modules/field/modules/list/tests/list_test.info b/core/modules/field/modules/list/tests/list_test.info similarity index 100% rename from modules/field/modules/list/tests/list_test.info rename to core/modules/field/modules/list/tests/list_test.info diff --git a/modules/field/modules/list/tests/list_test.module b/core/modules/field/modules/list/tests/list_test.module similarity index 100% rename from modules/field/modules/list/tests/list_test.module rename to core/modules/field/modules/list/tests/list_test.module diff --git a/modules/field/modules/number/number.info b/core/modules/field/modules/number/number.info similarity index 100% rename from modules/field/modules/number/number.info rename to core/modules/field/modules/number/number.info diff --git a/modules/field/modules/number/number.install b/core/modules/field/modules/number/number.install similarity index 100% rename from modules/field/modules/number/number.install rename to core/modules/field/modules/number/number.install diff --git a/modules/field/modules/number/number.module b/core/modules/field/modules/number/number.module similarity index 100% rename from modules/field/modules/number/number.module rename to core/modules/field/modules/number/number.module diff --git a/modules/field/modules/number/number.test b/core/modules/field/modules/number/number.test similarity index 100% rename from modules/field/modules/number/number.test rename to core/modules/field/modules/number/number.test diff --git a/modules/field/modules/options/options.api.php b/core/modules/field/modules/options/options.api.php similarity index 100% rename from modules/field/modules/options/options.api.php rename to core/modules/field/modules/options/options.api.php diff --git a/modules/field/modules/options/options.info b/core/modules/field/modules/options/options.info similarity index 100% rename from modules/field/modules/options/options.info rename to core/modules/field/modules/options/options.info diff --git a/modules/field/modules/options/options.module b/core/modules/field/modules/options/options.module similarity index 100% rename from modules/field/modules/options/options.module rename to core/modules/field/modules/options/options.module diff --git a/modules/field/modules/options/options.test b/core/modules/field/modules/options/options.test similarity index 100% rename from modules/field/modules/options/options.test rename to core/modules/field/modules/options/options.test diff --git a/modules/field/modules/text/text.info b/core/modules/field/modules/text/text.info similarity index 100% rename from modules/field/modules/text/text.info rename to core/modules/field/modules/text/text.info diff --git a/modules/field/modules/text/text.install b/core/modules/field/modules/text/text.install similarity index 100% rename from modules/field/modules/text/text.install rename to core/modules/field/modules/text/text.install diff --git a/modules/field/modules/text/text.js b/core/modules/field/modules/text/text.js similarity index 100% rename from modules/field/modules/text/text.js rename to core/modules/field/modules/text/text.js diff --git a/modules/field/modules/text/text.module b/core/modules/field/modules/text/text.module similarity index 100% rename from modules/field/modules/text/text.module rename to core/modules/field/modules/text/text.module diff --git a/modules/field/modules/text/text.test b/core/modules/field/modules/text/text.test similarity index 100% rename from modules/field/modules/text/text.test rename to core/modules/field/modules/text/text.test diff --git a/modules/field/tests/field.test b/core/modules/field/tests/field.test similarity index 100% rename from modules/field/tests/field.test rename to core/modules/field/tests/field.test diff --git a/modules/field/tests/field_test.entity.inc b/core/modules/field/tests/field_test.entity.inc similarity index 100% rename from modules/field/tests/field_test.entity.inc rename to core/modules/field/tests/field_test.entity.inc diff --git a/modules/field/tests/field_test.field.inc b/core/modules/field/tests/field_test.field.inc similarity index 100% rename from modules/field/tests/field_test.field.inc rename to core/modules/field/tests/field_test.field.inc diff --git a/modules/field/tests/field_test.info b/core/modules/field/tests/field_test.info similarity index 100% rename from modules/field/tests/field_test.info rename to core/modules/field/tests/field_test.info diff --git a/modules/field/tests/field_test.install b/core/modules/field/tests/field_test.install similarity index 100% rename from modules/field/tests/field_test.install rename to core/modules/field/tests/field_test.install diff --git a/modules/field/tests/field_test.module b/core/modules/field/tests/field_test.module similarity index 100% rename from modules/field/tests/field_test.module rename to core/modules/field/tests/field_test.module diff --git a/modules/field/tests/field_test.storage.inc b/core/modules/field/tests/field_test.storage.inc similarity index 100% rename from modules/field/tests/field_test.storage.inc rename to core/modules/field/tests/field_test.storage.inc diff --git a/modules/field/theme/field-rtl.css b/core/modules/field/theme/field-rtl.css similarity index 100% rename from modules/field/theme/field-rtl.css rename to core/modules/field/theme/field-rtl.css diff --git a/modules/field/theme/field.css b/core/modules/field/theme/field.css similarity index 100% rename from modules/field/theme/field.css rename to core/modules/field/theme/field.css diff --git a/modules/field/theme/field.tpl.php b/core/modules/field/theme/field.tpl.php similarity index 100% rename from modules/field/theme/field.tpl.php rename to core/modules/field/theme/field.tpl.php diff --git a/modules/field_ui/field_ui-rtl.css b/core/modules/field_ui/field_ui-rtl.css similarity index 100% rename from modules/field_ui/field_ui-rtl.css rename to core/modules/field_ui/field_ui-rtl.css diff --git a/modules/field_ui/field_ui.admin.inc b/core/modules/field_ui/field_ui.admin.inc similarity index 100% rename from modules/field_ui/field_ui.admin.inc rename to core/modules/field_ui/field_ui.admin.inc diff --git a/modules/field_ui/field_ui.api.php b/core/modules/field_ui/field_ui.api.php similarity index 100% rename from modules/field_ui/field_ui.api.php rename to core/modules/field_ui/field_ui.api.php diff --git a/modules/field_ui/field_ui.css b/core/modules/field_ui/field_ui.css similarity index 100% rename from modules/field_ui/field_ui.css rename to core/modules/field_ui/field_ui.css diff --git a/modules/field_ui/field_ui.info b/core/modules/field_ui/field_ui.info similarity index 100% rename from modules/field_ui/field_ui.info rename to core/modules/field_ui/field_ui.info diff --git a/modules/field_ui/field_ui.js b/core/modules/field_ui/field_ui.js similarity index 100% rename from modules/field_ui/field_ui.js rename to core/modules/field_ui/field_ui.js diff --git a/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module similarity index 100% rename from modules/field_ui/field_ui.module rename to core/modules/field_ui/field_ui.module diff --git a/modules/field_ui/field_ui.test b/core/modules/field_ui/field_ui.test similarity index 100% rename from modules/field_ui/field_ui.test rename to core/modules/field_ui/field_ui.test diff --git a/modules/file/file.api.php b/core/modules/file/file.api.php similarity index 100% rename from modules/file/file.api.php rename to core/modules/file/file.api.php diff --git a/modules/file/file.css b/core/modules/file/file.css similarity index 100% rename from modules/file/file.css rename to core/modules/file/file.css diff --git a/modules/file/file.field.inc b/core/modules/file/file.field.inc similarity index 100% rename from modules/file/file.field.inc rename to core/modules/file/file.field.inc diff --git a/modules/file/file.info b/core/modules/file/file.info similarity index 100% rename from modules/file/file.info rename to core/modules/file/file.info diff --git a/modules/file/file.install b/core/modules/file/file.install similarity index 100% rename from modules/file/file.install rename to core/modules/file/file.install diff --git a/modules/file/file.js b/core/modules/file/file.js similarity index 100% rename from modules/file/file.js rename to core/modules/file/file.js diff --git a/modules/file/file.module b/core/modules/file/file.module similarity index 100% rename from modules/file/file.module rename to core/modules/file/file.module diff --git a/modules/file/icons/application-octet-stream.png b/core/modules/file/icons/application-octet-stream.png similarity index 100% rename from modules/file/icons/application-octet-stream.png rename to core/modules/file/icons/application-octet-stream.png diff --git a/modules/file/icons/application-pdf.png b/core/modules/file/icons/application-pdf.png similarity index 100% rename from modules/file/icons/application-pdf.png rename to core/modules/file/icons/application-pdf.png diff --git a/modules/file/icons/application-x-executable.png b/core/modules/file/icons/application-x-executable.png similarity index 100% rename from modules/file/icons/application-x-executable.png rename to core/modules/file/icons/application-x-executable.png diff --git a/modules/file/icons/audio-x-generic.png b/core/modules/file/icons/audio-x-generic.png similarity index 100% rename from modules/file/icons/audio-x-generic.png rename to core/modules/file/icons/audio-x-generic.png diff --git a/modules/file/icons/image-x-generic.png b/core/modules/file/icons/image-x-generic.png similarity index 100% rename from modules/file/icons/image-x-generic.png rename to core/modules/file/icons/image-x-generic.png diff --git a/modules/file/icons/package-x-generic.png b/core/modules/file/icons/package-x-generic.png similarity index 100% rename from modules/file/icons/package-x-generic.png rename to core/modules/file/icons/package-x-generic.png diff --git a/modules/file/icons/text-html.png b/core/modules/file/icons/text-html.png similarity index 100% rename from modules/file/icons/text-html.png rename to core/modules/file/icons/text-html.png diff --git a/modules/file/icons/text-plain.png b/core/modules/file/icons/text-plain.png similarity index 100% rename from modules/file/icons/text-plain.png rename to core/modules/file/icons/text-plain.png diff --git a/modules/file/icons/text-x-generic.png b/core/modules/file/icons/text-x-generic.png similarity index 100% rename from modules/file/icons/text-x-generic.png rename to core/modules/file/icons/text-x-generic.png diff --git a/modules/file/icons/text-x-script.png b/core/modules/file/icons/text-x-script.png similarity index 100% rename from modules/file/icons/text-x-script.png rename to core/modules/file/icons/text-x-script.png diff --git a/modules/file/icons/video-x-generic.png b/core/modules/file/icons/video-x-generic.png similarity index 100% rename from modules/file/icons/video-x-generic.png rename to core/modules/file/icons/video-x-generic.png diff --git a/modules/file/icons/x-office-document.png b/core/modules/file/icons/x-office-document.png similarity index 100% rename from modules/file/icons/x-office-document.png rename to core/modules/file/icons/x-office-document.png diff --git a/modules/file/icons/x-office-presentation.png b/core/modules/file/icons/x-office-presentation.png similarity index 100% rename from modules/file/icons/x-office-presentation.png rename to core/modules/file/icons/x-office-presentation.png diff --git a/modules/file/icons/x-office-spreadsheet.png b/core/modules/file/icons/x-office-spreadsheet.png similarity index 100% rename from modules/file/icons/x-office-spreadsheet.png rename to core/modules/file/icons/x-office-spreadsheet.png diff --git a/modules/file/tests/file.test b/core/modules/file/tests/file.test similarity index 100% rename from modules/file/tests/file.test rename to core/modules/file/tests/file.test diff --git a/modules/file/tests/file_module_test.info b/core/modules/file/tests/file_module_test.info similarity index 100% rename from modules/file/tests/file_module_test.info rename to core/modules/file/tests/file_module_test.info diff --git a/modules/file/tests/file_module_test.module b/core/modules/file/tests/file_module_test.module similarity index 100% rename from modules/file/tests/file_module_test.module rename to core/modules/file/tests/file_module_test.module diff --git a/modules/filter/filter.admin.inc b/core/modules/filter/filter.admin.inc similarity index 100% rename from modules/filter/filter.admin.inc rename to core/modules/filter/filter.admin.inc diff --git a/modules/filter/filter.admin.js b/core/modules/filter/filter.admin.js similarity index 100% rename from modules/filter/filter.admin.js rename to core/modules/filter/filter.admin.js diff --git a/modules/filter/filter.api.php b/core/modules/filter/filter.api.php similarity index 100% rename from modules/filter/filter.api.php rename to core/modules/filter/filter.api.php diff --git a/modules/filter/filter.css b/core/modules/filter/filter.css similarity index 100% rename from modules/filter/filter.css rename to core/modules/filter/filter.css diff --git a/modules/filter/filter.info b/core/modules/filter/filter.info similarity index 100% rename from modules/filter/filter.info rename to core/modules/filter/filter.info diff --git a/modules/filter/filter.install b/core/modules/filter/filter.install similarity index 100% rename from modules/filter/filter.install rename to core/modules/filter/filter.install diff --git a/modules/filter/filter.js b/core/modules/filter/filter.js similarity index 100% rename from modules/filter/filter.js rename to core/modules/filter/filter.js diff --git a/modules/filter/filter.module b/core/modules/filter/filter.module similarity index 100% rename from modules/filter/filter.module rename to core/modules/filter/filter.module diff --git a/modules/filter/filter.pages.inc b/core/modules/filter/filter.pages.inc similarity index 100% rename from modules/filter/filter.pages.inc rename to core/modules/filter/filter.pages.inc diff --git a/modules/filter/filter.test b/core/modules/filter/filter.test similarity index 100% rename from modules/filter/filter.test rename to core/modules/filter/filter.test diff --git a/modules/filter/tests/filter.url-input.txt b/core/modules/filter/tests/filter.url-input.txt similarity index 100% rename from modules/filter/tests/filter.url-input.txt rename to core/modules/filter/tests/filter.url-input.txt diff --git a/modules/filter/tests/filter.url-output.txt b/core/modules/filter/tests/filter.url-output.txt similarity index 100% rename from modules/filter/tests/filter.url-output.txt rename to core/modules/filter/tests/filter.url-output.txt diff --git a/modules/forum/forum-icon.tpl.php b/core/modules/forum/forum-icon.tpl.php similarity index 100% rename from modules/forum/forum-icon.tpl.php rename to core/modules/forum/forum-icon.tpl.php diff --git a/modules/forum/forum-list.tpl.php b/core/modules/forum/forum-list.tpl.php similarity index 100% rename from modules/forum/forum-list.tpl.php rename to core/modules/forum/forum-list.tpl.php diff --git a/modules/forum/forum-rtl.css b/core/modules/forum/forum-rtl.css similarity index 100% rename from modules/forum/forum-rtl.css rename to core/modules/forum/forum-rtl.css diff --git a/modules/forum/forum-submitted.tpl.php b/core/modules/forum/forum-submitted.tpl.php similarity index 100% rename from modules/forum/forum-submitted.tpl.php rename to core/modules/forum/forum-submitted.tpl.php diff --git a/modules/forum/forum-topic-list.tpl.php b/core/modules/forum/forum-topic-list.tpl.php similarity index 100% rename from modules/forum/forum-topic-list.tpl.php rename to core/modules/forum/forum-topic-list.tpl.php diff --git a/modules/forum/forum.admin.inc b/core/modules/forum/forum.admin.inc similarity index 100% rename from modules/forum/forum.admin.inc rename to core/modules/forum/forum.admin.inc diff --git a/modules/forum/forum.css b/core/modules/forum/forum.css similarity index 100% rename from modules/forum/forum.css rename to core/modules/forum/forum.css diff --git a/modules/forum/forum.info b/core/modules/forum/forum.info similarity index 100% rename from modules/forum/forum.info rename to core/modules/forum/forum.info diff --git a/modules/forum/forum.install b/core/modules/forum/forum.install similarity index 100% rename from modules/forum/forum.install rename to core/modules/forum/forum.install diff --git a/modules/forum/forum.module b/core/modules/forum/forum.module similarity index 100% rename from modules/forum/forum.module rename to core/modules/forum/forum.module diff --git a/modules/forum/forum.pages.inc b/core/modules/forum/forum.pages.inc similarity index 100% rename from modules/forum/forum.pages.inc rename to core/modules/forum/forum.pages.inc diff --git a/modules/forum/forum.test b/core/modules/forum/forum.test similarity index 100% rename from modules/forum/forum.test rename to core/modules/forum/forum.test diff --git a/modules/forum/forums.tpl.php b/core/modules/forum/forums.tpl.php similarity index 100% rename from modules/forum/forums.tpl.php rename to core/modules/forum/forums.tpl.php diff --git a/modules/help/help-rtl.css b/core/modules/help/help-rtl.css similarity index 100% rename from modules/help/help-rtl.css rename to core/modules/help/help-rtl.css diff --git a/modules/help/help.admin.inc b/core/modules/help/help.admin.inc similarity index 100% rename from modules/help/help.admin.inc rename to core/modules/help/help.admin.inc diff --git a/modules/help/help.api.php b/core/modules/help/help.api.php similarity index 100% rename from modules/help/help.api.php rename to core/modules/help/help.api.php diff --git a/modules/help/help.css b/core/modules/help/help.css similarity index 100% rename from modules/help/help.css rename to core/modules/help/help.css diff --git a/modules/help/help.info b/core/modules/help/help.info similarity index 100% rename from modules/help/help.info rename to core/modules/help/help.info diff --git a/modules/help/help.module b/core/modules/help/help.module similarity index 100% rename from modules/help/help.module rename to core/modules/help/help.module diff --git a/modules/help/help.test b/core/modules/help/help.test similarity index 100% rename from modules/help/help.test rename to core/modules/help/help.test diff --git a/modules/image/image-rtl.css b/core/modules/image/image-rtl.css similarity index 100% rename from modules/image/image-rtl.css rename to core/modules/image/image-rtl.css diff --git a/modules/image/image.admin.css b/core/modules/image/image.admin.css similarity index 100% rename from modules/image/image.admin.css rename to core/modules/image/image.admin.css diff --git a/modules/image/image.admin.inc b/core/modules/image/image.admin.inc similarity index 100% rename from modules/image/image.admin.inc rename to core/modules/image/image.admin.inc diff --git a/modules/image/image.api.php b/core/modules/image/image.api.php similarity index 100% rename from modules/image/image.api.php rename to core/modules/image/image.api.php diff --git a/modules/image/image.css b/core/modules/image/image.css similarity index 100% rename from modules/image/image.css rename to core/modules/image/image.css diff --git a/modules/image/image.effects.inc b/core/modules/image/image.effects.inc similarity index 100% rename from modules/image/image.effects.inc rename to core/modules/image/image.effects.inc diff --git a/modules/image/image.field.inc b/core/modules/image/image.field.inc similarity index 100% rename from modules/image/image.field.inc rename to core/modules/image/image.field.inc diff --git a/modules/image/image.info b/core/modules/image/image.info similarity index 100% rename from modules/image/image.info rename to core/modules/image/image.info diff --git a/modules/image/image.install b/core/modules/image/image.install similarity index 100% rename from modules/image/image.install rename to core/modules/image/image.install diff --git a/modules/image/image.module b/core/modules/image/image.module similarity index 100% rename from modules/image/image.module rename to core/modules/image/image.module diff --git a/modules/image/image.test b/core/modules/image/image.test similarity index 100% rename from modules/image/image.test rename to core/modules/image/image.test diff --git a/modules/image/sample.png b/core/modules/image/sample.png similarity index 100% rename from modules/image/sample.png rename to core/modules/image/sample.png diff --git a/modules/image/tests/image_module_test.info b/core/modules/image/tests/image_module_test.info similarity index 100% rename from modules/image/tests/image_module_test.info rename to core/modules/image/tests/image_module_test.info diff --git a/modules/image/tests/image_module_test.module b/core/modules/image/tests/image_module_test.module similarity index 100% rename from modules/image/tests/image_module_test.module rename to core/modules/image/tests/image_module_test.module diff --git a/modules/locale/locale.admin.inc b/core/modules/locale/locale.admin.inc similarity index 100% rename from modules/locale/locale.admin.inc rename to core/modules/locale/locale.admin.inc diff --git a/modules/locale/locale.api.php b/core/modules/locale/locale.api.php similarity index 100% rename from modules/locale/locale.api.php rename to core/modules/locale/locale.api.php diff --git a/modules/locale/locale.css b/core/modules/locale/locale.css similarity index 100% rename from modules/locale/locale.css rename to core/modules/locale/locale.css diff --git a/modules/locale/locale.datepicker.js b/core/modules/locale/locale.datepicker.js similarity index 100% rename from modules/locale/locale.datepicker.js rename to core/modules/locale/locale.datepicker.js diff --git a/modules/locale/locale.info b/core/modules/locale/locale.info similarity index 100% rename from modules/locale/locale.info rename to core/modules/locale/locale.info diff --git a/modules/locale/locale.install b/core/modules/locale/locale.install similarity index 100% rename from modules/locale/locale.install rename to core/modules/locale/locale.install diff --git a/modules/locale/locale.module b/core/modules/locale/locale.module similarity index 100% rename from modules/locale/locale.module rename to core/modules/locale/locale.module diff --git a/modules/locale/locale.test b/core/modules/locale/locale.test similarity index 100% rename from modules/locale/locale.test rename to core/modules/locale/locale.test diff --git a/modules/locale/tests/locale_test.info b/core/modules/locale/tests/locale_test.info similarity index 100% rename from modules/locale/tests/locale_test.info rename to core/modules/locale/tests/locale_test.info diff --git a/modules/locale/tests/locale_test.module b/core/modules/locale/tests/locale_test.module similarity index 100% rename from modules/locale/tests/locale_test.module rename to core/modules/locale/tests/locale_test.module diff --git a/modules/locale/tests/translations/test.xx.po b/core/modules/locale/tests/translations/test.xx.po similarity index 100% rename from modules/locale/tests/translations/test.xx.po rename to core/modules/locale/tests/translations/test.xx.po diff --git a/modules/menu/menu.admin.inc b/core/modules/menu/menu.admin.inc similarity index 100% rename from modules/menu/menu.admin.inc rename to core/modules/menu/menu.admin.inc diff --git a/modules/menu/menu.admin.js b/core/modules/menu/menu.admin.js similarity index 100% rename from modules/menu/menu.admin.js rename to core/modules/menu/menu.admin.js diff --git a/modules/menu/menu.api.php b/core/modules/menu/menu.api.php similarity index 100% rename from modules/menu/menu.api.php rename to core/modules/menu/menu.api.php diff --git a/modules/menu/menu.css b/core/modules/menu/menu.css similarity index 100% rename from modules/menu/menu.css rename to core/modules/menu/menu.css diff --git a/modules/menu/menu.info b/core/modules/menu/menu.info similarity index 100% rename from modules/menu/menu.info rename to core/modules/menu/menu.info diff --git a/modules/menu/menu.install b/core/modules/menu/menu.install similarity index 100% rename from modules/menu/menu.install rename to core/modules/menu/menu.install diff --git a/modules/menu/menu.js b/core/modules/menu/menu.js similarity index 100% rename from modules/menu/menu.js rename to core/modules/menu/menu.js diff --git a/modules/menu/menu.module b/core/modules/menu/menu.module similarity index 100% rename from modules/menu/menu.module rename to core/modules/menu/menu.module diff --git a/modules/menu/menu.test b/core/modules/menu/menu.test similarity index 100% rename from modules/menu/menu.test rename to core/modules/menu/menu.test diff --git a/modules/node/content_types.inc b/core/modules/node/content_types.inc similarity index 100% rename from modules/node/content_types.inc rename to core/modules/node/content_types.inc diff --git a/modules/node/content_types.js b/core/modules/node/content_types.js similarity index 100% rename from modules/node/content_types.js rename to core/modules/node/content_types.js diff --git a/modules/node/node-rtl.css b/core/modules/node/node-rtl.css similarity index 100% rename from modules/node/node-rtl.css rename to core/modules/node/node-rtl.css diff --git a/modules/node/node.admin.inc b/core/modules/node/node.admin.inc similarity index 100% rename from modules/node/node.admin.inc rename to core/modules/node/node.admin.inc diff --git a/modules/node/node.api.php b/core/modules/node/node.api.php similarity index 100% rename from modules/node/node.api.php rename to core/modules/node/node.api.php diff --git a/modules/node/node.css b/core/modules/node/node.css similarity index 100% rename from modules/node/node.css rename to core/modules/node/node.css diff --git a/modules/node/node.info b/core/modules/node/node.info similarity index 100% rename from modules/node/node.info rename to core/modules/node/node.info diff --git a/modules/node/node.install b/core/modules/node/node.install similarity index 100% rename from modules/node/node.install rename to core/modules/node/node.install diff --git a/modules/node/node.js b/core/modules/node/node.js similarity index 100% rename from modules/node/node.js rename to core/modules/node/node.js diff --git a/modules/node/node.module b/core/modules/node/node.module similarity index 100% rename from modules/node/node.module rename to core/modules/node/node.module diff --git a/modules/node/node.pages.inc b/core/modules/node/node.pages.inc similarity index 100% rename from modules/node/node.pages.inc rename to core/modules/node/node.pages.inc diff --git a/modules/node/node.test b/core/modules/node/node.test similarity index 100% rename from modules/node/node.test rename to core/modules/node/node.test diff --git a/modules/node/node.tokens.inc b/core/modules/node/node.tokens.inc similarity index 100% rename from modules/node/node.tokens.inc rename to core/modules/node/node.tokens.inc diff --git a/modules/node/node.tpl.php b/core/modules/node/node.tpl.php similarity index 100% rename from modules/node/node.tpl.php rename to core/modules/node/node.tpl.php diff --git a/modules/node/tests/node_access_test.info b/core/modules/node/tests/node_access_test.info similarity index 100% rename from modules/node/tests/node_access_test.info rename to core/modules/node/tests/node_access_test.info diff --git a/modules/node/tests/node_access_test.module b/core/modules/node/tests/node_access_test.module similarity index 100% rename from modules/node/tests/node_access_test.module rename to core/modules/node/tests/node_access_test.module diff --git a/modules/node/tests/node_test.info b/core/modules/node/tests/node_test.info similarity index 100% rename from modules/node/tests/node_test.info rename to core/modules/node/tests/node_test.info diff --git a/modules/node/tests/node_test.module b/core/modules/node/tests/node_test.module similarity index 100% rename from modules/node/tests/node_test.module rename to core/modules/node/tests/node_test.module diff --git a/modules/node/tests/node_test_exception.info b/core/modules/node/tests/node_test_exception.info similarity index 100% rename from modules/node/tests/node_test_exception.info rename to core/modules/node/tests/node_test_exception.info diff --git a/modules/node/tests/node_test_exception.module b/core/modules/node/tests/node_test_exception.module similarity index 100% rename from modules/node/tests/node_test_exception.module rename to core/modules/node/tests/node_test_exception.module diff --git a/modules/openid/login-bg.png b/core/modules/openid/login-bg.png similarity index 100% rename from modules/openid/login-bg.png rename to core/modules/openid/login-bg.png diff --git a/modules/openid/openid-rtl.css b/core/modules/openid/openid-rtl.css similarity index 100% rename from modules/openid/openid-rtl.css rename to core/modules/openid/openid-rtl.css diff --git a/modules/openid/openid.api.php b/core/modules/openid/openid.api.php similarity index 100% rename from modules/openid/openid.api.php rename to core/modules/openid/openid.api.php diff --git a/modules/openid/openid.css b/core/modules/openid/openid.css similarity index 100% rename from modules/openid/openid.css rename to core/modules/openid/openid.css diff --git a/modules/openid/openid.inc b/core/modules/openid/openid.inc similarity index 100% rename from modules/openid/openid.inc rename to core/modules/openid/openid.inc diff --git a/modules/openid/openid.info b/core/modules/openid/openid.info similarity index 100% rename from modules/openid/openid.info rename to core/modules/openid/openid.info diff --git a/modules/openid/openid.install b/core/modules/openid/openid.install similarity index 100% rename from modules/openid/openid.install rename to core/modules/openid/openid.install diff --git a/modules/openid/openid.js b/core/modules/openid/openid.js similarity index 100% rename from modules/openid/openid.js rename to core/modules/openid/openid.js diff --git a/modules/openid/openid.module b/core/modules/openid/openid.module similarity index 100% rename from modules/openid/openid.module rename to core/modules/openid/openid.module diff --git a/modules/openid/openid.pages.inc b/core/modules/openid/openid.pages.inc similarity index 100% rename from modules/openid/openid.pages.inc rename to core/modules/openid/openid.pages.inc diff --git a/modules/openid/openid.test b/core/modules/openid/openid.test similarity index 100% rename from modules/openid/openid.test rename to core/modules/openid/openid.test diff --git a/modules/openid/tests/openid_test.info b/core/modules/openid/tests/openid_test.info similarity index 100% rename from modules/openid/tests/openid_test.info rename to core/modules/openid/tests/openid_test.info diff --git a/modules/openid/tests/openid_test.install b/core/modules/openid/tests/openid_test.install similarity index 100% rename from modules/openid/tests/openid_test.install rename to core/modules/openid/tests/openid_test.install diff --git a/modules/openid/tests/openid_test.module b/core/modules/openid/tests/openid_test.module similarity index 100% rename from modules/openid/tests/openid_test.module rename to core/modules/openid/tests/openid_test.module diff --git a/modules/overlay/images/background.png b/core/modules/overlay/images/background.png similarity index 100% rename from modules/overlay/images/background.png rename to core/modules/overlay/images/background.png diff --git a/modules/overlay/images/close.png b/core/modules/overlay/images/close.png similarity index 100% rename from modules/overlay/images/close.png rename to core/modules/overlay/images/close.png diff --git a/modules/overlay/overlay-child.css b/core/modules/overlay/overlay-child.css similarity index 100% rename from modules/overlay/overlay-child.css rename to core/modules/overlay/overlay-child.css diff --git a/modules/overlay/overlay-child.js b/core/modules/overlay/overlay-child.js similarity index 100% rename from modules/overlay/overlay-child.js rename to core/modules/overlay/overlay-child.js diff --git a/modules/overlay/overlay-parent.css b/core/modules/overlay/overlay-parent.css similarity index 100% rename from modules/overlay/overlay-parent.css rename to core/modules/overlay/overlay-parent.css diff --git a/modules/overlay/overlay-parent.js b/core/modules/overlay/overlay-parent.js similarity index 100% rename from modules/overlay/overlay-parent.js rename to core/modules/overlay/overlay-parent.js diff --git a/modules/overlay/overlay.api.php b/core/modules/overlay/overlay.api.php similarity index 100% rename from modules/overlay/overlay.api.php rename to core/modules/overlay/overlay.api.php diff --git a/modules/overlay/overlay.info b/core/modules/overlay/overlay.info similarity index 100% rename from modules/overlay/overlay.info rename to core/modules/overlay/overlay.info diff --git a/modules/overlay/overlay.install b/core/modules/overlay/overlay.install similarity index 100% rename from modules/overlay/overlay.install rename to core/modules/overlay/overlay.install diff --git a/modules/overlay/overlay.module b/core/modules/overlay/overlay.module similarity index 100% rename from modules/overlay/overlay.module rename to core/modules/overlay/overlay.module diff --git a/modules/overlay/overlay.tpl.php b/core/modules/overlay/overlay.tpl.php similarity index 100% rename from modules/overlay/overlay.tpl.php rename to core/modules/overlay/overlay.tpl.php diff --git a/modules/path/path.admin.inc b/core/modules/path/path.admin.inc similarity index 100% rename from modules/path/path.admin.inc rename to core/modules/path/path.admin.inc diff --git a/modules/path/path.api.php b/core/modules/path/path.api.php similarity index 100% rename from modules/path/path.api.php rename to core/modules/path/path.api.php diff --git a/modules/path/path.info b/core/modules/path/path.info similarity index 100% rename from modules/path/path.info rename to core/modules/path/path.info diff --git a/modules/path/path.js b/core/modules/path/path.js similarity index 100% rename from modules/path/path.js rename to core/modules/path/path.js diff --git a/modules/path/path.module b/core/modules/path/path.module similarity index 100% rename from modules/path/path.module rename to core/modules/path/path.module diff --git a/modules/path/path.test b/core/modules/path/path.test similarity index 100% rename from modules/path/path.test rename to core/modules/path/path.test diff --git a/modules/php/php.info b/core/modules/php/php.info similarity index 100% rename from modules/php/php.info rename to core/modules/php/php.info diff --git a/modules/php/php.install b/core/modules/php/php.install similarity index 100% rename from modules/php/php.install rename to core/modules/php/php.install diff --git a/modules/php/php.module b/core/modules/php/php.module similarity index 100% rename from modules/php/php.module rename to core/modules/php/php.module diff --git a/modules/php/php.test b/core/modules/php/php.test similarity index 100% rename from modules/php/php.test rename to core/modules/php/php.test diff --git a/modules/poll/poll-bar--block.tpl.php b/core/modules/poll/poll-bar--block.tpl.php similarity index 100% rename from modules/poll/poll-bar--block.tpl.php rename to core/modules/poll/poll-bar--block.tpl.php diff --git a/modules/poll/poll-bar.tpl.php b/core/modules/poll/poll-bar.tpl.php similarity index 100% rename from modules/poll/poll-bar.tpl.php rename to core/modules/poll/poll-bar.tpl.php diff --git a/modules/poll/poll-results--block.tpl.php b/core/modules/poll/poll-results--block.tpl.php similarity index 100% rename from modules/poll/poll-results--block.tpl.php rename to core/modules/poll/poll-results--block.tpl.php diff --git a/modules/poll/poll-results.tpl.php b/core/modules/poll/poll-results.tpl.php similarity index 100% rename from modules/poll/poll-results.tpl.php rename to core/modules/poll/poll-results.tpl.php diff --git a/modules/poll/poll-rtl.css b/core/modules/poll/poll-rtl.css similarity index 100% rename from modules/poll/poll-rtl.css rename to core/modules/poll/poll-rtl.css diff --git a/modules/poll/poll-vote.tpl.php b/core/modules/poll/poll-vote.tpl.php similarity index 100% rename from modules/poll/poll-vote.tpl.php rename to core/modules/poll/poll-vote.tpl.php diff --git a/modules/poll/poll.css b/core/modules/poll/poll.css similarity index 100% rename from modules/poll/poll.css rename to core/modules/poll/poll.css diff --git a/modules/poll/poll.info b/core/modules/poll/poll.info similarity index 100% rename from modules/poll/poll.info rename to core/modules/poll/poll.info diff --git a/modules/poll/poll.install b/core/modules/poll/poll.install similarity index 100% rename from modules/poll/poll.install rename to core/modules/poll/poll.install diff --git a/modules/poll/poll.module b/core/modules/poll/poll.module similarity index 100% rename from modules/poll/poll.module rename to core/modules/poll/poll.module diff --git a/modules/poll/poll.pages.inc b/core/modules/poll/poll.pages.inc similarity index 100% rename from modules/poll/poll.pages.inc rename to core/modules/poll/poll.pages.inc diff --git a/modules/poll/poll.test b/core/modules/poll/poll.test similarity index 100% rename from modules/poll/poll.test rename to core/modules/poll/poll.test diff --git a/modules/poll/poll.tokens.inc b/core/modules/poll/poll.tokens.inc similarity index 100% rename from modules/poll/poll.tokens.inc rename to core/modules/poll/poll.tokens.inc diff --git a/modules/profile/profile-block.tpl.php b/core/modules/profile/profile-block.tpl.php similarity index 100% rename from modules/profile/profile-block.tpl.php rename to core/modules/profile/profile-block.tpl.php diff --git a/modules/profile/profile-listing.tpl.php b/core/modules/profile/profile-listing.tpl.php similarity index 100% rename from modules/profile/profile-listing.tpl.php rename to core/modules/profile/profile-listing.tpl.php diff --git a/modules/profile/profile-wrapper.tpl.php b/core/modules/profile/profile-wrapper.tpl.php similarity index 100% rename from modules/profile/profile-wrapper.tpl.php rename to core/modules/profile/profile-wrapper.tpl.php diff --git a/modules/profile/profile.admin.inc b/core/modules/profile/profile.admin.inc similarity index 100% rename from modules/profile/profile.admin.inc rename to core/modules/profile/profile.admin.inc diff --git a/modules/profile/profile.css b/core/modules/profile/profile.css similarity index 100% rename from modules/profile/profile.css rename to core/modules/profile/profile.css diff --git a/modules/profile/profile.info b/core/modules/profile/profile.info similarity index 100% rename from modules/profile/profile.info rename to core/modules/profile/profile.info diff --git a/modules/profile/profile.install b/core/modules/profile/profile.install similarity index 100% rename from modules/profile/profile.install rename to core/modules/profile/profile.install diff --git a/modules/profile/profile.js b/core/modules/profile/profile.js similarity index 100% rename from modules/profile/profile.js rename to core/modules/profile/profile.js diff --git a/modules/profile/profile.module b/core/modules/profile/profile.module similarity index 100% rename from modules/profile/profile.module rename to core/modules/profile/profile.module diff --git a/modules/profile/profile.pages.inc b/core/modules/profile/profile.pages.inc similarity index 100% rename from modules/profile/profile.pages.inc rename to core/modules/profile/profile.pages.inc diff --git a/modules/profile/profile.test b/core/modules/profile/profile.test similarity index 100% rename from modules/profile/profile.test rename to core/modules/profile/profile.test diff --git a/modules/rdf/rdf.api.php b/core/modules/rdf/rdf.api.php similarity index 100% rename from modules/rdf/rdf.api.php rename to core/modules/rdf/rdf.api.php diff --git a/modules/rdf/rdf.info b/core/modules/rdf/rdf.info similarity index 100% rename from modules/rdf/rdf.info rename to core/modules/rdf/rdf.info diff --git a/modules/rdf/rdf.install b/core/modules/rdf/rdf.install similarity index 100% rename from modules/rdf/rdf.install rename to core/modules/rdf/rdf.install diff --git a/modules/rdf/rdf.module b/core/modules/rdf/rdf.module similarity index 100% rename from modules/rdf/rdf.module rename to core/modules/rdf/rdf.module diff --git a/modules/rdf/rdf.test b/core/modules/rdf/rdf.test similarity index 100% rename from modules/rdf/rdf.test rename to core/modules/rdf/rdf.test diff --git a/modules/rdf/tests/rdf_test.info b/core/modules/rdf/tests/rdf_test.info similarity index 100% rename from modules/rdf/tests/rdf_test.info rename to core/modules/rdf/tests/rdf_test.info diff --git a/modules/rdf/tests/rdf_test.install b/core/modules/rdf/tests/rdf_test.install similarity index 100% rename from modules/rdf/tests/rdf_test.install rename to core/modules/rdf/tests/rdf_test.install diff --git a/modules/rdf/tests/rdf_test.module b/core/modules/rdf/tests/rdf_test.module similarity index 100% rename from modules/rdf/tests/rdf_test.module rename to core/modules/rdf/tests/rdf_test.module diff --git a/modules/search/search-block-form.tpl.php b/core/modules/search/search-block-form.tpl.php similarity index 100% rename from modules/search/search-block-form.tpl.php rename to core/modules/search/search-block-form.tpl.php diff --git a/modules/search/search-result.tpl.php b/core/modules/search/search-result.tpl.php similarity index 100% rename from modules/search/search-result.tpl.php rename to core/modules/search/search-result.tpl.php diff --git a/modules/search/search-results.tpl.php b/core/modules/search/search-results.tpl.php similarity index 100% rename from modules/search/search-results.tpl.php rename to core/modules/search/search-results.tpl.php diff --git a/modules/search/search-rtl.css b/core/modules/search/search-rtl.css similarity index 100% rename from modules/search/search-rtl.css rename to core/modules/search/search-rtl.css diff --git a/modules/search/search.admin.inc b/core/modules/search/search.admin.inc similarity index 100% rename from modules/search/search.admin.inc rename to core/modules/search/search.admin.inc diff --git a/modules/search/search.api.php b/core/modules/search/search.api.php similarity index 100% rename from modules/search/search.api.php rename to core/modules/search/search.api.php diff --git a/modules/search/search.css b/core/modules/search/search.css similarity index 100% rename from modules/search/search.css rename to core/modules/search/search.css diff --git a/modules/search/search.extender.inc b/core/modules/search/search.extender.inc similarity index 100% rename from modules/search/search.extender.inc rename to core/modules/search/search.extender.inc diff --git a/modules/search/search.info b/core/modules/search/search.info similarity index 100% rename from modules/search/search.info rename to core/modules/search/search.info diff --git a/modules/search/search.install b/core/modules/search/search.install similarity index 100% rename from modules/search/search.install rename to core/modules/search/search.install diff --git a/modules/search/search.module b/core/modules/search/search.module similarity index 100% rename from modules/search/search.module rename to core/modules/search/search.module diff --git a/modules/search/search.pages.inc b/core/modules/search/search.pages.inc similarity index 100% rename from modules/search/search.pages.inc rename to core/modules/search/search.pages.inc diff --git a/modules/search/search.test b/core/modules/search/search.test similarity index 100% rename from modules/search/search.test rename to core/modules/search/search.test diff --git a/modules/search/tests/UnicodeTest.txt b/core/modules/search/tests/UnicodeTest.txt similarity index 100% rename from modules/search/tests/UnicodeTest.txt rename to core/modules/search/tests/UnicodeTest.txt diff --git a/modules/search/tests/search_embedded_form.info b/core/modules/search/tests/search_embedded_form.info similarity index 100% rename from modules/search/tests/search_embedded_form.info rename to core/modules/search/tests/search_embedded_form.info diff --git a/modules/search/tests/search_embedded_form.module b/core/modules/search/tests/search_embedded_form.module similarity index 100% rename from modules/search/tests/search_embedded_form.module rename to core/modules/search/tests/search_embedded_form.module diff --git a/modules/search/tests/search_extra_type.info b/core/modules/search/tests/search_extra_type.info similarity index 100% rename from modules/search/tests/search_extra_type.info rename to core/modules/search/tests/search_extra_type.info diff --git a/modules/search/tests/search_extra_type.module b/core/modules/search/tests/search_extra_type.module similarity index 100% rename from modules/search/tests/search_extra_type.module rename to core/modules/search/tests/search_extra_type.module diff --git a/modules/shortcut/shortcut-rtl.css b/core/modules/shortcut/shortcut-rtl.css similarity index 100% rename from modules/shortcut/shortcut-rtl.css rename to core/modules/shortcut/shortcut-rtl.css diff --git a/modules/shortcut/shortcut.admin.css b/core/modules/shortcut/shortcut.admin.css similarity index 100% rename from modules/shortcut/shortcut.admin.css rename to core/modules/shortcut/shortcut.admin.css diff --git a/modules/shortcut/shortcut.admin.inc b/core/modules/shortcut/shortcut.admin.inc similarity index 100% rename from modules/shortcut/shortcut.admin.inc rename to core/modules/shortcut/shortcut.admin.inc diff --git a/modules/shortcut/shortcut.admin.js b/core/modules/shortcut/shortcut.admin.js similarity index 100% rename from modules/shortcut/shortcut.admin.js rename to core/modules/shortcut/shortcut.admin.js diff --git a/modules/shortcut/shortcut.api.php b/core/modules/shortcut/shortcut.api.php similarity index 100% rename from modules/shortcut/shortcut.api.php rename to core/modules/shortcut/shortcut.api.php diff --git a/modules/shortcut/shortcut.css b/core/modules/shortcut/shortcut.css similarity index 100% rename from modules/shortcut/shortcut.css rename to core/modules/shortcut/shortcut.css diff --git a/modules/shortcut/shortcut.info b/core/modules/shortcut/shortcut.info similarity index 100% rename from modules/shortcut/shortcut.info rename to core/modules/shortcut/shortcut.info diff --git a/modules/shortcut/shortcut.install b/core/modules/shortcut/shortcut.install similarity index 100% rename from modules/shortcut/shortcut.install rename to core/modules/shortcut/shortcut.install diff --git a/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module similarity index 100% rename from modules/shortcut/shortcut.module rename to core/modules/shortcut/shortcut.module diff --git a/modules/shortcut/shortcut.png b/core/modules/shortcut/shortcut.png similarity index 100% rename from modules/shortcut/shortcut.png rename to core/modules/shortcut/shortcut.png diff --git a/modules/shortcut/shortcut.test b/core/modules/shortcut/shortcut.test similarity index 100% rename from modules/shortcut/shortcut.test rename to core/modules/shortcut/shortcut.test diff --git a/modules/simpletest/drupal_web_test_case.php b/core/modules/simpletest/drupal_web_test_case.php similarity index 100% rename from modules/simpletest/drupal_web_test_case.php rename to core/modules/simpletest/drupal_web_test_case.php diff --git a/modules/simpletest/files/README.txt b/core/modules/simpletest/files/README.txt similarity index 100% rename from modules/simpletest/files/README.txt rename to core/modules/simpletest/files/README.txt diff --git a/modules/simpletest/files/css_test_files/comment_hacks.css b/core/modules/simpletest/files/css_test_files/comment_hacks.css similarity index 100% rename from modules/simpletest/files/css_test_files/comment_hacks.css rename to core/modules/simpletest/files/css_test_files/comment_hacks.css diff --git a/modules/simpletest/files/css_test_files/comment_hacks.css.optimized.css b/core/modules/simpletest/files/css_test_files/comment_hacks.css.optimized.css similarity index 100% rename from modules/simpletest/files/css_test_files/comment_hacks.css.optimized.css rename to core/modules/simpletest/files/css_test_files/comment_hacks.css.optimized.css diff --git a/modules/simpletest/files/css_test_files/comment_hacks.css.unoptimized.css b/core/modules/simpletest/files/css_test_files/comment_hacks.css.unoptimized.css similarity index 100% rename from modules/simpletest/files/css_test_files/comment_hacks.css.unoptimized.css rename to core/modules/simpletest/files/css_test_files/comment_hacks.css.unoptimized.css diff --git a/modules/simpletest/files/css_test_files/css_input_with_import.css b/core/modules/simpletest/files/css_test_files/css_input_with_import.css similarity index 100% rename from modules/simpletest/files/css_test_files/css_input_with_import.css rename to core/modules/simpletest/files/css_test_files/css_input_with_import.css diff --git a/modules/simpletest/files/css_test_files/css_input_with_import.css.optimized.css b/core/modules/simpletest/files/css_test_files/css_input_with_import.css.optimized.css similarity index 100% rename from modules/simpletest/files/css_test_files/css_input_with_import.css.optimized.css rename to core/modules/simpletest/files/css_test_files/css_input_with_import.css.optimized.css diff --git a/modules/simpletest/files/css_test_files/css_input_with_import.css.unoptimized.css b/core/modules/simpletest/files/css_test_files/css_input_with_import.css.unoptimized.css similarity index 100% rename from modules/simpletest/files/css_test_files/css_input_with_import.css.unoptimized.css rename to core/modules/simpletest/files/css_test_files/css_input_with_import.css.unoptimized.css diff --git a/modules/simpletest/files/css_test_files/css_input_without_import.css b/core/modules/simpletest/files/css_test_files/css_input_without_import.css similarity index 100% rename from modules/simpletest/files/css_test_files/css_input_without_import.css rename to core/modules/simpletest/files/css_test_files/css_input_without_import.css diff --git a/modules/simpletest/files/css_test_files/css_input_without_import.css.optimized.css b/core/modules/simpletest/files/css_test_files/css_input_without_import.css.optimized.css similarity index 100% rename from modules/simpletest/files/css_test_files/css_input_without_import.css.optimized.css rename to core/modules/simpletest/files/css_test_files/css_input_without_import.css.optimized.css diff --git a/modules/simpletest/files/css_test_files/css_input_without_import.css.unoptimized.css b/core/modules/simpletest/files/css_test_files/css_input_without_import.css.unoptimized.css similarity index 100% rename from modules/simpletest/files/css_test_files/css_input_without_import.css.unoptimized.css rename to core/modules/simpletest/files/css_test_files/css_input_without_import.css.unoptimized.css diff --git a/modules/simpletest/files/css_test_files/import1.css b/core/modules/simpletest/files/css_test_files/import1.css similarity index 100% rename from modules/simpletest/files/css_test_files/import1.css rename to core/modules/simpletest/files/css_test_files/import1.css diff --git a/modules/simpletest/files/css_test_files/import2.css b/core/modules/simpletest/files/css_test_files/import2.css similarity index 100% rename from modules/simpletest/files/css_test_files/import2.css rename to core/modules/simpletest/files/css_test_files/import2.css diff --git a/modules/simpletest/files/html-1.txt b/core/modules/simpletest/files/html-1.txt similarity index 100% rename from modules/simpletest/files/html-1.txt rename to core/modules/simpletest/files/html-1.txt diff --git a/modules/simpletest/files/html-2.html b/core/modules/simpletest/files/html-2.html similarity index 100% rename from modules/simpletest/files/html-2.html rename to core/modules/simpletest/files/html-2.html diff --git a/modules/simpletest/files/image-1.png b/core/modules/simpletest/files/image-1.png similarity index 100% rename from modules/simpletest/files/image-1.png rename to core/modules/simpletest/files/image-1.png diff --git a/modules/simpletest/files/image-2.jpg b/core/modules/simpletest/files/image-2.jpg similarity index 100% rename from modules/simpletest/files/image-2.jpg rename to core/modules/simpletest/files/image-2.jpg diff --git a/modules/simpletest/files/image-test.gif b/core/modules/simpletest/files/image-test.gif similarity index 100% rename from modules/simpletest/files/image-test.gif rename to core/modules/simpletest/files/image-test.gif diff --git a/modules/simpletest/files/image-test.jpg b/core/modules/simpletest/files/image-test.jpg similarity index 100% rename from modules/simpletest/files/image-test.jpg rename to core/modules/simpletest/files/image-test.jpg diff --git a/modules/simpletest/files/image-test.png b/core/modules/simpletest/files/image-test.png similarity index 100% rename from modules/simpletest/files/image-test.png rename to core/modules/simpletest/files/image-test.png diff --git a/modules/simpletest/files/javascript-1.txt b/core/modules/simpletest/files/javascript-1.txt similarity index 100% rename from modules/simpletest/files/javascript-1.txt rename to core/modules/simpletest/files/javascript-1.txt diff --git a/modules/simpletest/files/javascript-2.script b/core/modules/simpletest/files/javascript-2.script similarity index 100% rename from modules/simpletest/files/javascript-2.script rename to core/modules/simpletest/files/javascript-2.script diff --git a/modules/simpletest/files/php-1.txt b/core/modules/simpletest/files/php-1.txt similarity index 100% rename from modules/simpletest/files/php-1.txt rename to core/modules/simpletest/files/php-1.txt diff --git a/modules/simpletest/files/php-2.php b/core/modules/simpletest/files/php-2.php similarity index 100% rename from modules/simpletest/files/php-2.php rename to core/modules/simpletest/files/php-2.php diff --git a/modules/simpletest/files/sql-1.txt b/core/modules/simpletest/files/sql-1.txt similarity index 100% rename from modules/simpletest/files/sql-1.txt rename to core/modules/simpletest/files/sql-1.txt diff --git a/modules/simpletest/files/sql-2.sql b/core/modules/simpletest/files/sql-2.sql similarity index 100% rename from modules/simpletest/files/sql-2.sql rename to core/modules/simpletest/files/sql-2.sql diff --git a/modules/simpletest/simpletest.api.php b/core/modules/simpletest/simpletest.api.php similarity index 100% rename from modules/simpletest/simpletest.api.php rename to core/modules/simpletest/simpletest.api.php diff --git a/modules/simpletest/simpletest.css b/core/modules/simpletest/simpletest.css similarity index 100% rename from modules/simpletest/simpletest.css rename to core/modules/simpletest/simpletest.css diff --git a/modules/simpletest/simpletest.info b/core/modules/simpletest/simpletest.info similarity index 100% rename from modules/simpletest/simpletest.info rename to core/modules/simpletest/simpletest.info diff --git a/modules/simpletest/simpletest.install b/core/modules/simpletest/simpletest.install similarity index 100% rename from modules/simpletest/simpletest.install rename to core/modules/simpletest/simpletest.install diff --git a/modules/simpletest/simpletest.js b/core/modules/simpletest/simpletest.js similarity index 100% rename from modules/simpletest/simpletest.js rename to core/modules/simpletest/simpletest.js diff --git a/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module similarity index 100% rename from modules/simpletest/simpletest.module rename to core/modules/simpletest/simpletest.module diff --git a/modules/simpletest/simpletest.pages.inc b/core/modules/simpletest/simpletest.pages.inc similarity index 100% rename from modules/simpletest/simpletest.pages.inc rename to core/modules/simpletest/simpletest.pages.inc diff --git a/modules/simpletest/simpletest.test b/core/modules/simpletest/simpletest.test similarity index 100% rename from modules/simpletest/simpletest.test rename to core/modules/simpletest/simpletest.test diff --git a/modules/simpletest/tests/actions.test b/core/modules/simpletest/tests/actions.test similarity index 100% rename from modules/simpletest/tests/actions.test rename to core/modules/simpletest/tests/actions.test diff --git a/modules/simpletest/tests/actions_loop_test.info b/core/modules/simpletest/tests/actions_loop_test.info similarity index 100% rename from modules/simpletest/tests/actions_loop_test.info rename to core/modules/simpletest/tests/actions_loop_test.info diff --git a/modules/simpletest/tests/actions_loop_test.install b/core/modules/simpletest/tests/actions_loop_test.install similarity index 100% rename from modules/simpletest/tests/actions_loop_test.install rename to core/modules/simpletest/tests/actions_loop_test.install diff --git a/modules/simpletest/tests/actions_loop_test.module b/core/modules/simpletest/tests/actions_loop_test.module similarity index 100% rename from modules/simpletest/tests/actions_loop_test.module rename to core/modules/simpletest/tests/actions_loop_test.module diff --git a/modules/simpletest/tests/ajax.test b/core/modules/simpletest/tests/ajax.test similarity index 100% rename from modules/simpletest/tests/ajax.test rename to core/modules/simpletest/tests/ajax.test diff --git a/modules/simpletest/tests/ajax_forms_test.info b/core/modules/simpletest/tests/ajax_forms_test.info similarity index 100% rename from modules/simpletest/tests/ajax_forms_test.info rename to core/modules/simpletest/tests/ajax_forms_test.info diff --git a/modules/simpletest/tests/ajax_forms_test.module b/core/modules/simpletest/tests/ajax_forms_test.module similarity index 100% rename from modules/simpletest/tests/ajax_forms_test.module rename to core/modules/simpletest/tests/ajax_forms_test.module diff --git a/modules/simpletest/tests/ajax_test.info b/core/modules/simpletest/tests/ajax_test.info similarity index 100% rename from modules/simpletest/tests/ajax_test.info rename to core/modules/simpletest/tests/ajax_test.info diff --git a/modules/simpletest/tests/ajax_test.module b/core/modules/simpletest/tests/ajax_test.module similarity index 100% rename from modules/simpletest/tests/ajax_test.module rename to core/modules/simpletest/tests/ajax_test.module diff --git a/modules/simpletest/tests/batch.test b/core/modules/simpletest/tests/batch.test similarity index 100% rename from modules/simpletest/tests/batch.test rename to core/modules/simpletest/tests/batch.test diff --git a/modules/simpletest/tests/batch_test.callbacks.inc b/core/modules/simpletest/tests/batch_test.callbacks.inc similarity index 100% rename from modules/simpletest/tests/batch_test.callbacks.inc rename to core/modules/simpletest/tests/batch_test.callbacks.inc diff --git a/modules/simpletest/tests/batch_test.info b/core/modules/simpletest/tests/batch_test.info similarity index 100% rename from modules/simpletest/tests/batch_test.info rename to core/modules/simpletest/tests/batch_test.info diff --git a/modules/simpletest/tests/batch_test.module b/core/modules/simpletest/tests/batch_test.module similarity index 100% rename from modules/simpletest/tests/batch_test.module rename to core/modules/simpletest/tests/batch_test.module diff --git a/modules/simpletest/tests/bootstrap.test b/core/modules/simpletest/tests/bootstrap.test similarity index 100% rename from modules/simpletest/tests/bootstrap.test rename to core/modules/simpletest/tests/bootstrap.test diff --git a/modules/simpletest/tests/cache.test b/core/modules/simpletest/tests/cache.test similarity index 100% rename from modules/simpletest/tests/cache.test rename to core/modules/simpletest/tests/cache.test diff --git a/modules/simpletest/tests/common.test b/core/modules/simpletest/tests/common.test similarity index 100% rename from modules/simpletest/tests/common.test rename to core/modules/simpletest/tests/common.test diff --git a/modules/simpletest/tests/common_test.css b/core/modules/simpletest/tests/common_test.css similarity index 100% rename from modules/simpletest/tests/common_test.css rename to core/modules/simpletest/tests/common_test.css diff --git a/modules/simpletest/tests/common_test.info b/core/modules/simpletest/tests/common_test.info similarity index 100% rename from modules/simpletest/tests/common_test.info rename to core/modules/simpletest/tests/common_test.info diff --git a/modules/simpletest/tests/common_test.module b/core/modules/simpletest/tests/common_test.module similarity index 100% rename from modules/simpletest/tests/common_test.module rename to core/modules/simpletest/tests/common_test.module diff --git a/modules/simpletest/tests/common_test.print.css b/core/modules/simpletest/tests/common_test.print.css similarity index 100% rename from modules/simpletest/tests/common_test.print.css rename to core/modules/simpletest/tests/common_test.print.css diff --git a/modules/simpletest/tests/common_test_info.txt b/core/modules/simpletest/tests/common_test_info.txt similarity index 100% rename from modules/simpletest/tests/common_test_info.txt rename to core/modules/simpletest/tests/common_test_info.txt diff --git a/modules/simpletest/tests/database_test.info b/core/modules/simpletest/tests/database_test.info similarity index 100% rename from modules/simpletest/tests/database_test.info rename to core/modules/simpletest/tests/database_test.info diff --git a/modules/simpletest/tests/database_test.install b/core/modules/simpletest/tests/database_test.install similarity index 100% rename from modules/simpletest/tests/database_test.install rename to core/modules/simpletest/tests/database_test.install diff --git a/modules/simpletest/tests/database_test.module b/core/modules/simpletest/tests/database_test.module similarity index 100% rename from modules/simpletest/tests/database_test.module rename to core/modules/simpletest/tests/database_test.module diff --git a/modules/simpletest/tests/database_test.test b/core/modules/simpletest/tests/database_test.test similarity index 100% rename from modules/simpletest/tests/database_test.test rename to core/modules/simpletest/tests/database_test.test diff --git a/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info b/core/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info similarity index 100% rename from modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info rename to core/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info diff --git a/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module b/core/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module similarity index 100% rename from modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module rename to core/modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module diff --git a/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info b/core/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info similarity index 100% rename from modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info rename to core/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info diff --git a/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.module b/core/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.module similarity index 100% rename from modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.module rename to core/modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.module diff --git a/modules/simpletest/tests/entity_cache_test.info b/core/modules/simpletest/tests/entity_cache_test.info similarity index 100% rename from modules/simpletest/tests/entity_cache_test.info rename to core/modules/simpletest/tests/entity_cache_test.info diff --git a/modules/simpletest/tests/entity_cache_test.module b/core/modules/simpletest/tests/entity_cache_test.module similarity index 100% rename from modules/simpletest/tests/entity_cache_test.module rename to core/modules/simpletest/tests/entity_cache_test.module diff --git a/modules/simpletest/tests/entity_cache_test_dependency.info b/core/modules/simpletest/tests/entity_cache_test_dependency.info similarity index 100% rename from modules/simpletest/tests/entity_cache_test_dependency.info rename to core/modules/simpletest/tests/entity_cache_test_dependency.info diff --git a/modules/simpletest/tests/entity_cache_test_dependency.module b/core/modules/simpletest/tests/entity_cache_test_dependency.module similarity index 100% rename from modules/simpletest/tests/entity_cache_test_dependency.module rename to core/modules/simpletest/tests/entity_cache_test_dependency.module diff --git a/modules/simpletest/tests/entity_crud_hook_test.info b/core/modules/simpletest/tests/entity_crud_hook_test.info similarity index 100% rename from modules/simpletest/tests/entity_crud_hook_test.info rename to core/modules/simpletest/tests/entity_crud_hook_test.info diff --git a/modules/simpletest/tests/entity_crud_hook_test.module b/core/modules/simpletest/tests/entity_crud_hook_test.module similarity index 100% rename from modules/simpletest/tests/entity_crud_hook_test.module rename to core/modules/simpletest/tests/entity_crud_hook_test.module diff --git a/modules/simpletest/tests/entity_crud_hook_test.test b/core/modules/simpletest/tests/entity_crud_hook_test.test similarity index 100% rename from modules/simpletest/tests/entity_crud_hook_test.test rename to core/modules/simpletest/tests/entity_crud_hook_test.test diff --git a/modules/simpletest/tests/entity_query.test b/core/modules/simpletest/tests/entity_query.test similarity index 100% rename from modules/simpletest/tests/entity_query.test rename to core/modules/simpletest/tests/entity_query.test diff --git a/modules/simpletest/tests/error.test b/core/modules/simpletest/tests/error.test similarity index 100% rename from modules/simpletest/tests/error.test rename to core/modules/simpletest/tests/error.test diff --git a/modules/simpletest/tests/error_test.info b/core/modules/simpletest/tests/error_test.info similarity index 100% rename from modules/simpletest/tests/error_test.info rename to core/modules/simpletest/tests/error_test.info diff --git a/modules/simpletest/tests/error_test.module b/core/modules/simpletest/tests/error_test.module similarity index 100% rename from modules/simpletest/tests/error_test.module rename to core/modules/simpletest/tests/error_test.module diff --git a/modules/simpletest/tests/file.test b/core/modules/simpletest/tests/file.test similarity index 100% rename from modules/simpletest/tests/file.test rename to core/modules/simpletest/tests/file.test diff --git a/modules/simpletest/tests/file_test.info b/core/modules/simpletest/tests/file_test.info similarity index 100% rename from modules/simpletest/tests/file_test.info rename to core/modules/simpletest/tests/file_test.info diff --git a/modules/simpletest/tests/file_test.module b/core/modules/simpletest/tests/file_test.module similarity index 100% rename from modules/simpletest/tests/file_test.module rename to core/modules/simpletest/tests/file_test.module diff --git a/modules/simpletest/tests/filetransfer.test b/core/modules/simpletest/tests/filetransfer.test similarity index 100% rename from modules/simpletest/tests/filetransfer.test rename to core/modules/simpletest/tests/filetransfer.test diff --git a/modules/simpletest/tests/filter_test.info b/core/modules/simpletest/tests/filter_test.info similarity index 100% rename from modules/simpletest/tests/filter_test.info rename to core/modules/simpletest/tests/filter_test.info diff --git a/modules/simpletest/tests/filter_test.module b/core/modules/simpletest/tests/filter_test.module similarity index 100% rename from modules/simpletest/tests/filter_test.module rename to core/modules/simpletest/tests/filter_test.module diff --git a/modules/simpletest/tests/form.test b/core/modules/simpletest/tests/form.test similarity index 100% rename from modules/simpletest/tests/form.test rename to core/modules/simpletest/tests/form.test diff --git a/modules/simpletest/tests/form_test.file.inc b/core/modules/simpletest/tests/form_test.file.inc similarity index 100% rename from modules/simpletest/tests/form_test.file.inc rename to core/modules/simpletest/tests/form_test.file.inc diff --git a/modules/simpletest/tests/form_test.info b/core/modules/simpletest/tests/form_test.info similarity index 100% rename from modules/simpletest/tests/form_test.info rename to core/modules/simpletest/tests/form_test.info diff --git a/modules/simpletest/tests/form_test.module b/core/modules/simpletest/tests/form_test.module similarity index 100% rename from modules/simpletest/tests/form_test.module rename to core/modules/simpletest/tests/form_test.module diff --git a/modules/simpletest/tests/graph.test b/core/modules/simpletest/tests/graph.test similarity index 100% rename from modules/simpletest/tests/graph.test rename to core/modules/simpletest/tests/graph.test diff --git a/modules/simpletest/tests/http.php b/core/modules/simpletest/tests/http.php similarity index 100% rename from modules/simpletest/tests/http.php rename to core/modules/simpletest/tests/http.php diff --git a/modules/simpletest/tests/https.php b/core/modules/simpletest/tests/https.php similarity index 100% rename from modules/simpletest/tests/https.php rename to core/modules/simpletest/tests/https.php diff --git a/modules/simpletest/tests/image.test b/core/modules/simpletest/tests/image.test similarity index 100% rename from modules/simpletest/tests/image.test rename to core/modules/simpletest/tests/image.test diff --git a/modules/simpletest/tests/image_test.info b/core/modules/simpletest/tests/image_test.info similarity index 100% rename from modules/simpletest/tests/image_test.info rename to core/modules/simpletest/tests/image_test.info diff --git a/modules/simpletest/tests/image_test.module b/core/modules/simpletest/tests/image_test.module similarity index 100% rename from modules/simpletest/tests/image_test.module rename to core/modules/simpletest/tests/image_test.module diff --git a/modules/simpletest/tests/lock.test b/core/modules/simpletest/tests/lock.test similarity index 100% rename from modules/simpletest/tests/lock.test rename to core/modules/simpletest/tests/lock.test diff --git a/modules/simpletest/tests/mail.test b/core/modules/simpletest/tests/mail.test similarity index 100% rename from modules/simpletest/tests/mail.test rename to core/modules/simpletest/tests/mail.test diff --git a/modules/simpletest/tests/menu.test b/core/modules/simpletest/tests/menu.test similarity index 100% rename from modules/simpletest/tests/menu.test rename to core/modules/simpletest/tests/menu.test diff --git a/modules/simpletest/tests/menu_test.info b/core/modules/simpletest/tests/menu_test.info similarity index 100% rename from modules/simpletest/tests/menu_test.info rename to core/modules/simpletest/tests/menu_test.info diff --git a/modules/simpletest/tests/menu_test.module b/core/modules/simpletest/tests/menu_test.module similarity index 100% rename from modules/simpletest/tests/menu_test.module rename to core/modules/simpletest/tests/menu_test.module diff --git a/modules/simpletest/tests/module.test b/core/modules/simpletest/tests/module.test similarity index 100% rename from modules/simpletest/tests/module.test rename to core/modules/simpletest/tests/module.test diff --git a/modules/simpletest/tests/module_test.file.inc b/core/modules/simpletest/tests/module_test.file.inc similarity index 100% rename from modules/simpletest/tests/module_test.file.inc rename to core/modules/simpletest/tests/module_test.file.inc diff --git a/modules/simpletest/tests/module_test.info b/core/modules/simpletest/tests/module_test.info similarity index 100% rename from modules/simpletest/tests/module_test.info rename to core/modules/simpletest/tests/module_test.info diff --git a/modules/simpletest/tests/module_test.install b/core/modules/simpletest/tests/module_test.install similarity index 100% rename from modules/simpletest/tests/module_test.install rename to core/modules/simpletest/tests/module_test.install diff --git a/modules/simpletest/tests/module_test.module b/core/modules/simpletest/tests/module_test.module similarity index 100% rename from modules/simpletest/tests/module_test.module rename to core/modules/simpletest/tests/module_test.module diff --git a/modules/simpletest/tests/password.test b/core/modules/simpletest/tests/password.test similarity index 100% rename from modules/simpletest/tests/password.test rename to core/modules/simpletest/tests/password.test diff --git a/modules/simpletest/tests/path.test b/core/modules/simpletest/tests/path.test similarity index 100% rename from modules/simpletest/tests/path.test rename to core/modules/simpletest/tests/path.test diff --git a/modules/simpletest/tests/registry.test b/core/modules/simpletest/tests/registry.test similarity index 100% rename from modules/simpletest/tests/registry.test rename to core/modules/simpletest/tests/registry.test diff --git a/modules/simpletest/tests/requirements1_test.info b/core/modules/simpletest/tests/requirements1_test.info similarity index 100% rename from modules/simpletest/tests/requirements1_test.info rename to core/modules/simpletest/tests/requirements1_test.info diff --git a/modules/simpletest/tests/requirements1_test.install b/core/modules/simpletest/tests/requirements1_test.install similarity index 100% rename from modules/simpletest/tests/requirements1_test.install rename to core/modules/simpletest/tests/requirements1_test.install diff --git a/modules/simpletest/tests/requirements1_test.module b/core/modules/simpletest/tests/requirements1_test.module similarity index 100% rename from modules/simpletest/tests/requirements1_test.module rename to core/modules/simpletest/tests/requirements1_test.module diff --git a/modules/simpletest/tests/requirements2_test.info b/core/modules/simpletest/tests/requirements2_test.info similarity index 100% rename from modules/simpletest/tests/requirements2_test.info rename to core/modules/simpletest/tests/requirements2_test.info diff --git a/modules/simpletest/tests/requirements2_test.module b/core/modules/simpletest/tests/requirements2_test.module similarity index 100% rename from modules/simpletest/tests/requirements2_test.module rename to core/modules/simpletest/tests/requirements2_test.module diff --git a/modules/simpletest/tests/schema.test b/core/modules/simpletest/tests/schema.test similarity index 100% rename from modules/simpletest/tests/schema.test rename to core/modules/simpletest/tests/schema.test diff --git a/modules/simpletest/tests/session.test b/core/modules/simpletest/tests/session.test similarity index 100% rename from modules/simpletest/tests/session.test rename to core/modules/simpletest/tests/session.test diff --git a/modules/simpletest/tests/session_test.info b/core/modules/simpletest/tests/session_test.info similarity index 100% rename from modules/simpletest/tests/session_test.info rename to core/modules/simpletest/tests/session_test.info diff --git a/modules/simpletest/tests/session_test.module b/core/modules/simpletest/tests/session_test.module similarity index 100% rename from modules/simpletest/tests/session_test.module rename to core/modules/simpletest/tests/session_test.module diff --git a/modules/simpletest/tests/system.base.css b/core/modules/simpletest/tests/system.base.css similarity index 100% rename from modules/simpletest/tests/system.base.css rename to core/modules/simpletest/tests/system.base.css diff --git a/modules/simpletest/tests/system_dependencies_test.info b/core/modules/simpletest/tests/system_dependencies_test.info similarity index 100% rename from modules/simpletest/tests/system_dependencies_test.info rename to core/modules/simpletest/tests/system_dependencies_test.info diff --git a/modules/simpletest/tests/system_dependencies_test.module b/core/modules/simpletest/tests/system_dependencies_test.module similarity index 100% rename from modules/simpletest/tests/system_dependencies_test.module rename to core/modules/simpletest/tests/system_dependencies_test.module diff --git a/modules/simpletest/tests/system_test.info b/core/modules/simpletest/tests/system_test.info similarity index 100% rename from modules/simpletest/tests/system_test.info rename to core/modules/simpletest/tests/system_test.info diff --git a/modules/simpletest/tests/system_test.module b/core/modules/simpletest/tests/system_test.module similarity index 100% rename from modules/simpletest/tests/system_test.module rename to core/modules/simpletest/tests/system_test.module diff --git a/modules/simpletest/tests/tablesort.test b/core/modules/simpletest/tests/tablesort.test similarity index 100% rename from modules/simpletest/tests/tablesort.test rename to core/modules/simpletest/tests/tablesort.test diff --git a/modules/simpletest/tests/taxonomy_test.info b/core/modules/simpletest/tests/taxonomy_test.info similarity index 100% rename from modules/simpletest/tests/taxonomy_test.info rename to core/modules/simpletest/tests/taxonomy_test.info diff --git a/modules/simpletest/tests/taxonomy_test.install b/core/modules/simpletest/tests/taxonomy_test.install similarity index 100% rename from modules/simpletest/tests/taxonomy_test.install rename to core/modules/simpletest/tests/taxonomy_test.install diff --git a/modules/simpletest/tests/taxonomy_test.module b/core/modules/simpletest/tests/taxonomy_test.module similarity index 100% rename from modules/simpletest/tests/taxonomy_test.module rename to core/modules/simpletest/tests/taxonomy_test.module diff --git a/modules/simpletest/tests/theme.test b/core/modules/simpletest/tests/theme.test similarity index 100% rename from modules/simpletest/tests/theme.test rename to core/modules/simpletest/tests/theme.test diff --git a/modules/simpletest/tests/theme_test.info b/core/modules/simpletest/tests/theme_test.info similarity index 100% rename from modules/simpletest/tests/theme_test.info rename to core/modules/simpletest/tests/theme_test.info diff --git a/modules/simpletest/tests/theme_test.module b/core/modules/simpletest/tests/theme_test.module similarity index 100% rename from modules/simpletest/tests/theme_test.module rename to core/modules/simpletest/tests/theme_test.module diff --git a/modules/simpletest/tests/unicode.test b/core/modules/simpletest/tests/unicode.test similarity index 100% rename from modules/simpletest/tests/unicode.test rename to core/modules/simpletest/tests/unicode.test diff --git a/modules/simpletest/tests/update.test b/core/modules/simpletest/tests/update.test similarity index 100% rename from modules/simpletest/tests/update.test rename to core/modules/simpletest/tests/update.test diff --git a/modules/simpletest/tests/update_test_1.info b/core/modules/simpletest/tests/update_test_1.info similarity index 100% rename from modules/simpletest/tests/update_test_1.info rename to core/modules/simpletest/tests/update_test_1.info diff --git a/modules/simpletest/tests/update_test_1.install b/core/modules/simpletest/tests/update_test_1.install similarity index 100% rename from modules/simpletest/tests/update_test_1.install rename to core/modules/simpletest/tests/update_test_1.install diff --git a/modules/simpletest/tests/update_test_1.module b/core/modules/simpletest/tests/update_test_1.module similarity index 100% rename from modules/simpletest/tests/update_test_1.module rename to core/modules/simpletest/tests/update_test_1.module diff --git a/modules/simpletest/tests/update_test_2.info b/core/modules/simpletest/tests/update_test_2.info similarity index 100% rename from modules/simpletest/tests/update_test_2.info rename to core/modules/simpletest/tests/update_test_2.info diff --git a/modules/simpletest/tests/update_test_2.install b/core/modules/simpletest/tests/update_test_2.install similarity index 100% rename from modules/simpletest/tests/update_test_2.install rename to core/modules/simpletest/tests/update_test_2.install diff --git a/modules/simpletest/tests/update_test_2.module b/core/modules/simpletest/tests/update_test_2.module similarity index 100% rename from modules/simpletest/tests/update_test_2.module rename to core/modules/simpletest/tests/update_test_2.module diff --git a/modules/simpletest/tests/update_test_3.info b/core/modules/simpletest/tests/update_test_3.info similarity index 100% rename from modules/simpletest/tests/update_test_3.info rename to core/modules/simpletest/tests/update_test_3.info diff --git a/modules/simpletest/tests/update_test_3.install b/core/modules/simpletest/tests/update_test_3.install similarity index 100% rename from modules/simpletest/tests/update_test_3.install rename to core/modules/simpletest/tests/update_test_3.install diff --git a/modules/simpletest/tests/update_test_3.module b/core/modules/simpletest/tests/update_test_3.module similarity index 100% rename from modules/simpletest/tests/update_test_3.module rename to core/modules/simpletest/tests/update_test_3.module diff --git a/modules/simpletest/tests/upgrade/upgrade.test b/core/modules/simpletest/tests/upgrade/upgrade.test similarity index 100% rename from modules/simpletest/tests/upgrade/upgrade.test rename to core/modules/simpletest/tests/upgrade/upgrade.test diff --git a/modules/simpletest/tests/url_alter_test.info b/core/modules/simpletest/tests/url_alter_test.info similarity index 100% rename from modules/simpletest/tests/url_alter_test.info rename to core/modules/simpletest/tests/url_alter_test.info diff --git a/modules/simpletest/tests/url_alter_test.install b/core/modules/simpletest/tests/url_alter_test.install similarity index 100% rename from modules/simpletest/tests/url_alter_test.install rename to core/modules/simpletest/tests/url_alter_test.install diff --git a/modules/simpletest/tests/url_alter_test.module b/core/modules/simpletest/tests/url_alter_test.module similarity index 100% rename from modules/simpletest/tests/url_alter_test.module rename to core/modules/simpletest/tests/url_alter_test.module diff --git a/modules/simpletest/tests/xmlrpc.test b/core/modules/simpletest/tests/xmlrpc.test similarity index 100% rename from modules/simpletest/tests/xmlrpc.test rename to core/modules/simpletest/tests/xmlrpc.test diff --git a/modules/simpletest/tests/xmlrpc_test.info b/core/modules/simpletest/tests/xmlrpc_test.info similarity index 100% rename from modules/simpletest/tests/xmlrpc_test.info rename to core/modules/simpletest/tests/xmlrpc_test.info diff --git a/modules/simpletest/tests/xmlrpc_test.module b/core/modules/simpletest/tests/xmlrpc_test.module similarity index 100% rename from modules/simpletest/tests/xmlrpc_test.module rename to core/modules/simpletest/tests/xmlrpc_test.module diff --git a/modules/statistics/statistics.admin.inc b/core/modules/statistics/statistics.admin.inc similarity index 100% rename from modules/statistics/statistics.admin.inc rename to core/modules/statistics/statistics.admin.inc diff --git a/modules/statistics/statistics.info b/core/modules/statistics/statistics.info similarity index 100% rename from modules/statistics/statistics.info rename to core/modules/statistics/statistics.info diff --git a/modules/statistics/statistics.install b/core/modules/statistics/statistics.install similarity index 100% rename from modules/statistics/statistics.install rename to core/modules/statistics/statistics.install diff --git a/modules/statistics/statistics.module b/core/modules/statistics/statistics.module similarity index 100% rename from modules/statistics/statistics.module rename to core/modules/statistics/statistics.module diff --git a/modules/statistics/statistics.pages.inc b/core/modules/statistics/statistics.pages.inc similarity index 100% rename from modules/statistics/statistics.pages.inc rename to core/modules/statistics/statistics.pages.inc diff --git a/modules/statistics/statistics.test b/core/modules/statistics/statistics.test similarity index 100% rename from modules/statistics/statistics.test rename to core/modules/statistics/statistics.test diff --git a/modules/statistics/statistics.tokens.inc b/core/modules/statistics/statistics.tokens.inc similarity index 100% rename from modules/statistics/statistics.tokens.inc rename to core/modules/statistics/statistics.tokens.inc diff --git a/modules/syslog/syslog.info b/core/modules/syslog/syslog.info similarity index 100% rename from modules/syslog/syslog.info rename to core/modules/syslog/syslog.info diff --git a/modules/syslog/syslog.install b/core/modules/syslog/syslog.install similarity index 100% rename from modules/syslog/syslog.install rename to core/modules/syslog/syslog.install diff --git a/modules/syslog/syslog.module b/core/modules/syslog/syslog.module similarity index 100% rename from modules/syslog/syslog.module rename to core/modules/syslog/syslog.module diff --git a/modules/syslog/syslog.test b/core/modules/syslog/syslog.test similarity index 100% rename from modules/syslog/syslog.test rename to core/modules/syslog/syslog.test diff --git a/modules/system/html.tpl.php b/core/modules/system/html.tpl.php similarity index 100% rename from modules/system/html.tpl.php rename to core/modules/system/html.tpl.php diff --git a/modules/system/image.gd.inc b/core/modules/system/image.gd.inc similarity index 100% rename from modules/system/image.gd.inc rename to core/modules/system/image.gd.inc diff --git a/modules/system/maintenance-page.tpl.php b/core/modules/system/maintenance-page.tpl.php similarity index 100% rename from modules/system/maintenance-page.tpl.php rename to core/modules/system/maintenance-page.tpl.php diff --git a/modules/system/page.tpl.php b/core/modules/system/page.tpl.php similarity index 100% rename from modules/system/page.tpl.php rename to core/modules/system/page.tpl.php diff --git a/modules/system/region.tpl.php b/core/modules/system/region.tpl.php similarity index 100% rename from modules/system/region.tpl.php rename to core/modules/system/region.tpl.php diff --git a/modules/system/system.admin-rtl.css b/core/modules/system/system.admin-rtl.css similarity index 100% rename from modules/system/system.admin-rtl.css rename to core/modules/system/system.admin-rtl.css diff --git a/modules/system/system.admin.css b/core/modules/system/system.admin.css similarity index 100% rename from modules/system/system.admin.css rename to core/modules/system/system.admin.css diff --git a/modules/system/system.admin.inc b/core/modules/system/system.admin.inc similarity index 100% rename from modules/system/system.admin.inc rename to core/modules/system/system.admin.inc diff --git a/modules/system/system.api.php b/core/modules/system/system.api.php similarity index 100% rename from modules/system/system.api.php rename to core/modules/system/system.api.php diff --git a/modules/system/system.archiver.inc b/core/modules/system/system.archiver.inc similarity index 100% rename from modules/system/system.archiver.inc rename to core/modules/system/system.archiver.inc diff --git a/modules/system/system.base-rtl.css b/core/modules/system/system.base-rtl.css similarity index 100% rename from modules/system/system.base-rtl.css rename to core/modules/system/system.base-rtl.css diff --git a/modules/system/system.base.css b/core/modules/system/system.base.css similarity index 100% rename from modules/system/system.base.css rename to core/modules/system/system.base.css diff --git a/modules/system/system.cron.js b/core/modules/system/system.cron.js similarity index 100% rename from modules/system/system.cron.js rename to core/modules/system/system.cron.js diff --git a/modules/system/system.info b/core/modules/system/system.info similarity index 100% rename from modules/system/system.info rename to core/modules/system/system.info diff --git a/modules/system/system.install b/core/modules/system/system.install similarity index 100% rename from modules/system/system.install rename to core/modules/system/system.install diff --git a/modules/system/system.js b/core/modules/system/system.js similarity index 100% rename from modules/system/system.js rename to core/modules/system/system.js diff --git a/modules/system/system.mail.inc b/core/modules/system/system.mail.inc similarity index 100% rename from modules/system/system.mail.inc rename to core/modules/system/system.mail.inc diff --git a/modules/system/system.maintenance.css b/core/modules/system/system.maintenance.css similarity index 100% rename from modules/system/system.maintenance.css rename to core/modules/system/system.maintenance.css diff --git a/modules/system/system.menus-rtl.css b/core/modules/system/system.menus-rtl.css similarity index 100% rename from modules/system/system.menus-rtl.css rename to core/modules/system/system.menus-rtl.css diff --git a/modules/system/system.menus.css b/core/modules/system/system.menus.css similarity index 100% rename from modules/system/system.menus.css rename to core/modules/system/system.menus.css diff --git a/modules/system/system.messages-rtl.css b/core/modules/system/system.messages-rtl.css similarity index 100% rename from modules/system/system.messages-rtl.css rename to core/modules/system/system.messages-rtl.css diff --git a/modules/system/system.messages.css b/core/modules/system/system.messages.css similarity index 100% rename from modules/system/system.messages.css rename to core/modules/system/system.messages.css diff --git a/modules/system/system.module b/core/modules/system/system.module similarity index 100% rename from modules/system/system.module rename to core/modules/system/system.module diff --git a/modules/system/system.queue.inc b/core/modules/system/system.queue.inc similarity index 100% rename from modules/system/system.queue.inc rename to core/modules/system/system.queue.inc diff --git a/modules/system/system.tar.inc b/core/modules/system/system.tar.inc similarity index 100% rename from modules/system/system.tar.inc rename to core/modules/system/system.tar.inc diff --git a/modules/system/system.test b/core/modules/system/system.test similarity index 100% rename from modules/system/system.test rename to core/modules/system/system.test diff --git a/modules/system/system.theme-rtl.css b/core/modules/system/system.theme-rtl.css similarity index 100% rename from modules/system/system.theme-rtl.css rename to core/modules/system/system.theme-rtl.css diff --git a/modules/system/system.theme.css b/core/modules/system/system.theme.css similarity index 100% rename from modules/system/system.theme.css rename to core/modules/system/system.theme.css diff --git a/modules/system/system.tokens.inc b/core/modules/system/system.tokens.inc similarity index 100% rename from modules/system/system.tokens.inc rename to core/modules/system/system.tokens.inc diff --git a/modules/system/system.updater.inc b/core/modules/system/system.updater.inc similarity index 100% rename from modules/system/system.updater.inc rename to core/modules/system/system.updater.inc diff --git a/modules/system/theme.api.php b/core/modules/system/theme.api.php similarity index 100% rename from modules/system/theme.api.php rename to core/modules/system/theme.api.php diff --git a/modules/taxonomy/taxonomy-term.tpl.php b/core/modules/taxonomy/taxonomy-term.tpl.php similarity index 100% rename from modules/taxonomy/taxonomy-term.tpl.php rename to core/modules/taxonomy/taxonomy-term.tpl.php diff --git a/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc similarity index 100% rename from modules/taxonomy/taxonomy.admin.inc rename to core/modules/taxonomy/taxonomy.admin.inc diff --git a/modules/taxonomy/taxonomy.api.php b/core/modules/taxonomy/taxonomy.api.php similarity index 100% rename from modules/taxonomy/taxonomy.api.php rename to core/modules/taxonomy/taxonomy.api.php diff --git a/modules/taxonomy/taxonomy.css b/core/modules/taxonomy/taxonomy.css similarity index 100% rename from modules/taxonomy/taxonomy.css rename to core/modules/taxonomy/taxonomy.css diff --git a/modules/taxonomy/taxonomy.info b/core/modules/taxonomy/taxonomy.info similarity index 100% rename from modules/taxonomy/taxonomy.info rename to core/modules/taxonomy/taxonomy.info diff --git a/modules/taxonomy/taxonomy.install b/core/modules/taxonomy/taxonomy.install similarity index 100% rename from modules/taxonomy/taxonomy.install rename to core/modules/taxonomy/taxonomy.install diff --git a/modules/taxonomy/taxonomy.js b/core/modules/taxonomy/taxonomy.js similarity index 100% rename from modules/taxonomy/taxonomy.js rename to core/modules/taxonomy/taxonomy.js diff --git a/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module similarity index 100% rename from modules/taxonomy/taxonomy.module rename to core/modules/taxonomy/taxonomy.module diff --git a/modules/taxonomy/taxonomy.pages.inc b/core/modules/taxonomy/taxonomy.pages.inc similarity index 100% rename from modules/taxonomy/taxonomy.pages.inc rename to core/modules/taxonomy/taxonomy.pages.inc diff --git a/modules/taxonomy/taxonomy.test b/core/modules/taxonomy/taxonomy.test similarity index 100% rename from modules/taxonomy/taxonomy.test rename to core/modules/taxonomy/taxonomy.test diff --git a/modules/taxonomy/taxonomy.tokens.inc b/core/modules/taxonomy/taxonomy.tokens.inc similarity index 100% rename from modules/taxonomy/taxonomy.tokens.inc rename to core/modules/taxonomy/taxonomy.tokens.inc diff --git a/modules/toolbar/toolbar-rtl.css b/core/modules/toolbar/toolbar-rtl.css similarity index 100% rename from modules/toolbar/toolbar-rtl.css rename to core/modules/toolbar/toolbar-rtl.css diff --git a/modules/toolbar/toolbar.css b/core/modules/toolbar/toolbar.css similarity index 100% rename from modules/toolbar/toolbar.css rename to core/modules/toolbar/toolbar.css diff --git a/modules/toolbar/toolbar.info b/core/modules/toolbar/toolbar.info similarity index 100% rename from modules/toolbar/toolbar.info rename to core/modules/toolbar/toolbar.info diff --git a/modules/toolbar/toolbar.js b/core/modules/toolbar/toolbar.js similarity index 100% rename from modules/toolbar/toolbar.js rename to core/modules/toolbar/toolbar.js diff --git a/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module similarity index 100% rename from modules/toolbar/toolbar.module rename to core/modules/toolbar/toolbar.module diff --git a/modules/toolbar/toolbar.png b/core/modules/toolbar/toolbar.png similarity index 100% rename from modules/toolbar/toolbar.png rename to core/modules/toolbar/toolbar.png diff --git a/modules/toolbar/toolbar.tpl.php b/core/modules/toolbar/toolbar.tpl.php similarity index 100% rename from modules/toolbar/toolbar.tpl.php rename to core/modules/toolbar/toolbar.tpl.php diff --git a/modules/tracker/tracker.css b/core/modules/tracker/tracker.css similarity index 100% rename from modules/tracker/tracker.css rename to core/modules/tracker/tracker.css diff --git a/modules/tracker/tracker.info b/core/modules/tracker/tracker.info similarity index 100% rename from modules/tracker/tracker.info rename to core/modules/tracker/tracker.info diff --git a/modules/tracker/tracker.install b/core/modules/tracker/tracker.install similarity index 100% rename from modules/tracker/tracker.install rename to core/modules/tracker/tracker.install diff --git a/modules/tracker/tracker.module b/core/modules/tracker/tracker.module similarity index 100% rename from modules/tracker/tracker.module rename to core/modules/tracker/tracker.module diff --git a/modules/tracker/tracker.pages.inc b/core/modules/tracker/tracker.pages.inc similarity index 100% rename from modules/tracker/tracker.pages.inc rename to core/modules/tracker/tracker.pages.inc diff --git a/modules/tracker/tracker.test b/core/modules/tracker/tracker.test similarity index 100% rename from modules/tracker/tracker.test rename to core/modules/tracker/tracker.test diff --git a/modules/translation/tests/translation_test.info b/core/modules/translation/tests/translation_test.info similarity index 100% rename from modules/translation/tests/translation_test.info rename to core/modules/translation/tests/translation_test.info diff --git a/modules/translation/tests/translation_test.module b/core/modules/translation/tests/translation_test.module similarity index 100% rename from modules/translation/tests/translation_test.module rename to core/modules/translation/tests/translation_test.module diff --git a/modules/translation/translation.info b/core/modules/translation/translation.info similarity index 100% rename from modules/translation/translation.info rename to core/modules/translation/translation.info diff --git a/modules/translation/translation.module b/core/modules/translation/translation.module similarity index 100% rename from modules/translation/translation.module rename to core/modules/translation/translation.module diff --git a/modules/translation/translation.pages.inc b/core/modules/translation/translation.pages.inc similarity index 100% rename from modules/translation/translation.pages.inc rename to core/modules/translation/translation.pages.inc diff --git a/modules/translation/translation.test b/core/modules/translation/translation.test similarity index 100% rename from modules/translation/translation.test rename to core/modules/translation/translation.test diff --git a/modules/trigger/tests/trigger_test.info b/core/modules/trigger/tests/trigger_test.info similarity index 100% rename from modules/trigger/tests/trigger_test.info rename to core/modules/trigger/tests/trigger_test.info diff --git a/modules/trigger/tests/trigger_test.module b/core/modules/trigger/tests/trigger_test.module similarity index 100% rename from modules/trigger/tests/trigger_test.module rename to core/modules/trigger/tests/trigger_test.module diff --git a/modules/trigger/trigger.admin.inc b/core/modules/trigger/trigger.admin.inc similarity index 100% rename from modules/trigger/trigger.admin.inc rename to core/modules/trigger/trigger.admin.inc diff --git a/modules/trigger/trigger.api.php b/core/modules/trigger/trigger.api.php similarity index 100% rename from modules/trigger/trigger.api.php rename to core/modules/trigger/trigger.api.php diff --git a/modules/trigger/trigger.info b/core/modules/trigger/trigger.info similarity index 100% rename from modules/trigger/trigger.info rename to core/modules/trigger/trigger.info diff --git a/modules/trigger/trigger.install b/core/modules/trigger/trigger.install similarity index 100% rename from modules/trigger/trigger.install rename to core/modules/trigger/trigger.install diff --git a/modules/trigger/trigger.module b/core/modules/trigger/trigger.module similarity index 100% rename from modules/trigger/trigger.module rename to core/modules/trigger/trigger.module diff --git a/modules/trigger/trigger.test b/core/modules/trigger/trigger.test similarity index 100% rename from modules/trigger/trigger.test rename to core/modules/trigger/trigger.test diff --git a/modules/update/tests/aaa_update_test.1_0.xml b/core/modules/update/tests/aaa_update_test.1_0.xml similarity index 100% rename from modules/update/tests/aaa_update_test.1_0.xml rename to core/modules/update/tests/aaa_update_test.1_0.xml diff --git a/modules/update/tests/aaa_update_test.info b/core/modules/update/tests/aaa_update_test.info similarity index 100% rename from modules/update/tests/aaa_update_test.info rename to core/modules/update/tests/aaa_update_test.info diff --git a/modules/update/tests/aaa_update_test.module b/core/modules/update/tests/aaa_update_test.module similarity index 100% rename from modules/update/tests/aaa_update_test.module rename to core/modules/update/tests/aaa_update_test.module diff --git a/modules/update/tests/aaa_update_test.no-releases.xml b/core/modules/update/tests/aaa_update_test.no-releases.xml similarity index 100% rename from modules/update/tests/aaa_update_test.no-releases.xml rename to core/modules/update/tests/aaa_update_test.no-releases.xml diff --git a/modules/update/tests/aaa_update_test.tar.gz b/core/modules/update/tests/aaa_update_test.tar.gz similarity index 100% rename from modules/update/tests/aaa_update_test.tar.gz rename to core/modules/update/tests/aaa_update_test.tar.gz diff --git a/modules/update/tests/bbb_update_test.1_0.xml b/core/modules/update/tests/bbb_update_test.1_0.xml similarity index 100% rename from modules/update/tests/bbb_update_test.1_0.xml rename to core/modules/update/tests/bbb_update_test.1_0.xml diff --git a/modules/update/tests/bbb_update_test.info b/core/modules/update/tests/bbb_update_test.info similarity index 100% rename from modules/update/tests/bbb_update_test.info rename to core/modules/update/tests/bbb_update_test.info diff --git a/modules/update/tests/bbb_update_test.module b/core/modules/update/tests/bbb_update_test.module similarity index 100% rename from modules/update/tests/bbb_update_test.module rename to core/modules/update/tests/bbb_update_test.module diff --git a/modules/update/tests/ccc_update_test.1_0.xml b/core/modules/update/tests/ccc_update_test.1_0.xml similarity index 100% rename from modules/update/tests/ccc_update_test.1_0.xml rename to core/modules/update/tests/ccc_update_test.1_0.xml diff --git a/modules/update/tests/ccc_update_test.info b/core/modules/update/tests/ccc_update_test.info similarity index 100% rename from modules/update/tests/ccc_update_test.info rename to core/modules/update/tests/ccc_update_test.info diff --git a/modules/update/tests/ccc_update_test.module b/core/modules/update/tests/ccc_update_test.module similarity index 100% rename from modules/update/tests/ccc_update_test.module rename to core/modules/update/tests/ccc_update_test.module diff --git a/modules/update/tests/drupal.0.xml b/core/modules/update/tests/drupal.0.xml similarity index 100% rename from modules/update/tests/drupal.0.xml rename to core/modules/update/tests/drupal.0.xml diff --git a/modules/update/tests/drupal.1.xml b/core/modules/update/tests/drupal.1.xml similarity index 100% rename from modules/update/tests/drupal.1.xml rename to core/modules/update/tests/drupal.1.xml diff --git a/modules/update/tests/drupal.2-sec.xml b/core/modules/update/tests/drupal.2-sec.xml similarity index 100% rename from modules/update/tests/drupal.2-sec.xml rename to core/modules/update/tests/drupal.2-sec.xml diff --git a/modules/update/tests/drupal.dev.xml b/core/modules/update/tests/drupal.dev.xml similarity index 100% rename from modules/update/tests/drupal.dev.xml rename to core/modules/update/tests/drupal.dev.xml diff --git a/modules/update/tests/update_test.info b/core/modules/update/tests/update_test.info similarity index 100% rename from modules/update/tests/update_test.info rename to core/modules/update/tests/update_test.info diff --git a/modules/update/tests/update_test.module b/core/modules/update/tests/update_test.module similarity index 100% rename from modules/update/tests/update_test.module rename to core/modules/update/tests/update_test.module diff --git a/modules/update/tests/update_test_basetheme.1_1-sec.xml b/core/modules/update/tests/update_test_basetheme.1_1-sec.xml similarity index 100% rename from modules/update/tests/update_test_basetheme.1_1-sec.xml rename to core/modules/update/tests/update_test_basetheme.1_1-sec.xml diff --git a/modules/update/tests/update_test_subtheme.1_0.xml b/core/modules/update/tests/update_test_subtheme.1_0.xml similarity index 100% rename from modules/update/tests/update_test_subtheme.1_0.xml rename to core/modules/update/tests/update_test_subtheme.1_0.xml diff --git a/modules/update/update-rtl.css b/core/modules/update/update-rtl.css similarity index 100% rename from modules/update/update-rtl.css rename to core/modules/update/update-rtl.css diff --git a/modules/update/update.api.php b/core/modules/update/update.api.php similarity index 100% rename from modules/update/update.api.php rename to core/modules/update/update.api.php diff --git a/modules/update/update.authorize.inc b/core/modules/update/update.authorize.inc similarity index 100% rename from modules/update/update.authorize.inc rename to core/modules/update/update.authorize.inc diff --git a/modules/update/update.compare.inc b/core/modules/update/update.compare.inc similarity index 100% rename from modules/update/update.compare.inc rename to core/modules/update/update.compare.inc diff --git a/modules/update/update.css b/core/modules/update/update.css similarity index 100% rename from modules/update/update.css rename to core/modules/update/update.css diff --git a/modules/update/update.fetch.inc b/core/modules/update/update.fetch.inc similarity index 100% rename from modules/update/update.fetch.inc rename to core/modules/update/update.fetch.inc diff --git a/modules/update/update.info b/core/modules/update/update.info similarity index 100% rename from modules/update/update.info rename to core/modules/update/update.info diff --git a/modules/update/update.install b/core/modules/update/update.install similarity index 100% rename from modules/update/update.install rename to core/modules/update/update.install diff --git a/modules/update/update.manager.inc b/core/modules/update/update.manager.inc similarity index 100% rename from modules/update/update.manager.inc rename to core/modules/update/update.manager.inc diff --git a/modules/update/update.module b/core/modules/update/update.module similarity index 100% rename from modules/update/update.module rename to core/modules/update/update.module diff --git a/modules/update/update.report.inc b/core/modules/update/update.report.inc similarity index 100% rename from modules/update/update.report.inc rename to core/modules/update/update.report.inc diff --git a/modules/update/update.settings.inc b/core/modules/update/update.settings.inc similarity index 100% rename from modules/update/update.settings.inc rename to core/modules/update/update.settings.inc diff --git a/modules/update/update.test b/core/modules/update/update.test similarity index 100% rename from modules/update/update.test rename to core/modules/update/update.test diff --git a/modules/user/tests/user_form_test.info b/core/modules/user/tests/user_form_test.info similarity index 100% rename from modules/user/tests/user_form_test.info rename to core/modules/user/tests/user_form_test.info diff --git a/modules/user/tests/user_form_test.module b/core/modules/user/tests/user_form_test.module similarity index 100% rename from modules/user/tests/user_form_test.module rename to core/modules/user/tests/user_form_test.module diff --git a/modules/user/user-picture.tpl.php b/core/modules/user/user-picture.tpl.php similarity index 100% rename from modules/user/user-picture.tpl.php rename to core/modules/user/user-picture.tpl.php diff --git a/modules/user/user-profile-category.tpl.php b/core/modules/user/user-profile-category.tpl.php similarity index 100% rename from modules/user/user-profile-category.tpl.php rename to core/modules/user/user-profile-category.tpl.php diff --git a/modules/user/user-profile-item.tpl.php b/core/modules/user/user-profile-item.tpl.php similarity index 100% rename from modules/user/user-profile-item.tpl.php rename to core/modules/user/user-profile-item.tpl.php diff --git a/modules/user/user-profile.tpl.php b/core/modules/user/user-profile.tpl.php similarity index 100% rename from modules/user/user-profile.tpl.php rename to core/modules/user/user-profile.tpl.php diff --git a/modules/user/user-rtl.css b/core/modules/user/user-rtl.css similarity index 100% rename from modules/user/user-rtl.css rename to core/modules/user/user-rtl.css diff --git a/modules/user/user.admin.inc b/core/modules/user/user.admin.inc similarity index 100% rename from modules/user/user.admin.inc rename to core/modules/user/user.admin.inc diff --git a/modules/user/user.api.php b/core/modules/user/user.api.php similarity index 100% rename from modules/user/user.api.php rename to core/modules/user/user.api.php diff --git a/modules/user/user.css b/core/modules/user/user.css similarity index 100% rename from modules/user/user.css rename to core/modules/user/user.css diff --git a/modules/user/user.info b/core/modules/user/user.info similarity index 100% rename from modules/user/user.info rename to core/modules/user/user.info diff --git a/modules/user/user.install b/core/modules/user/user.install similarity index 100% rename from modules/user/user.install rename to core/modules/user/user.install diff --git a/modules/user/user.js b/core/modules/user/user.js similarity index 100% rename from modules/user/user.js rename to core/modules/user/user.js diff --git a/modules/user/user.module b/core/modules/user/user.module similarity index 100% rename from modules/user/user.module rename to core/modules/user/user.module diff --git a/modules/user/user.pages.inc b/core/modules/user/user.pages.inc similarity index 100% rename from modules/user/user.pages.inc rename to core/modules/user/user.pages.inc diff --git a/modules/user/user.permissions.js b/core/modules/user/user.permissions.js similarity index 100% rename from modules/user/user.permissions.js rename to core/modules/user/user.permissions.js diff --git a/modules/user/user.test b/core/modules/user/user.test similarity index 100% rename from modules/user/user.test rename to core/modules/user/user.test diff --git a/modules/user/user.tokens.inc b/core/modules/user/user.tokens.inc similarity index 100% rename from modules/user/user.tokens.inc rename to core/modules/user/user.tokens.inc diff --git a/scripts/code-clean.sh b/core/scripts/code-clean.sh similarity index 100% rename from scripts/code-clean.sh rename to core/scripts/code-clean.sh diff --git a/scripts/cron-curl.sh b/core/scripts/cron-curl.sh similarity index 100% rename from scripts/cron-curl.sh rename to core/scripts/cron-curl.sh diff --git a/scripts/cron-lynx.sh b/core/scripts/cron-lynx.sh similarity index 100% rename from scripts/cron-lynx.sh rename to core/scripts/cron-lynx.sh diff --git a/scripts/drupal.sh b/core/scripts/drupal.sh similarity index 100% rename from scripts/drupal.sh rename to core/scripts/drupal.sh diff --git a/scripts/dump-database-d6.sh b/core/scripts/dump-database-d6.sh similarity index 100% rename from scripts/dump-database-d6.sh rename to core/scripts/dump-database-d6.sh diff --git a/scripts/generate-d6-content.sh b/core/scripts/generate-d6-content.sh similarity index 100% rename from scripts/generate-d6-content.sh rename to core/scripts/generate-d6-content.sh diff --git a/scripts/password-hash.sh b/core/scripts/password-hash.sh similarity index 100% rename from scripts/password-hash.sh rename to core/scripts/password-hash.sh diff --git a/scripts/run-tests.sh b/core/scripts/run-tests.sh similarity index 100% rename from scripts/run-tests.sh rename to core/scripts/run-tests.sh diff --git a/themes/README.txt b/core/themes/README.txt similarity index 100% rename from themes/README.txt rename to core/themes/README.txt diff --git a/themes/bartik/bartik.info b/core/themes/bartik/bartik.info similarity index 100% rename from themes/bartik/bartik.info rename to core/themes/bartik/bartik.info diff --git a/themes/bartik/color/base.png b/core/themes/bartik/color/base.png similarity index 100% rename from themes/bartik/color/base.png rename to core/themes/bartik/color/base.png diff --git a/themes/bartik/color/color.inc b/core/themes/bartik/color/color.inc similarity index 100% rename from themes/bartik/color/color.inc rename to core/themes/bartik/color/color.inc diff --git a/themes/bartik/color/preview.css b/core/themes/bartik/color/preview.css similarity index 100% rename from themes/bartik/color/preview.css rename to core/themes/bartik/color/preview.css diff --git a/themes/bartik/color/preview.html b/core/themes/bartik/color/preview.html similarity index 100% rename from themes/bartik/color/preview.html rename to core/themes/bartik/color/preview.html diff --git a/themes/bartik/color/preview.js b/core/themes/bartik/color/preview.js similarity index 100% rename from themes/bartik/color/preview.js rename to core/themes/bartik/color/preview.js diff --git a/themes/bartik/color/preview.png b/core/themes/bartik/color/preview.png similarity index 100% rename from themes/bartik/color/preview.png rename to core/themes/bartik/color/preview.png diff --git a/themes/bartik/css/colors.css b/core/themes/bartik/css/colors.css similarity index 100% rename from themes/bartik/css/colors.css rename to core/themes/bartik/css/colors.css diff --git a/themes/bartik/css/ie-rtl.css b/core/themes/bartik/css/ie-rtl.css similarity index 100% rename from themes/bartik/css/ie-rtl.css rename to core/themes/bartik/css/ie-rtl.css diff --git a/themes/bartik/css/ie.css b/core/themes/bartik/css/ie.css similarity index 100% rename from themes/bartik/css/ie.css rename to core/themes/bartik/css/ie.css diff --git a/themes/bartik/css/ie6.css b/core/themes/bartik/css/ie6.css similarity index 100% rename from themes/bartik/css/ie6.css rename to core/themes/bartik/css/ie6.css diff --git a/themes/bartik/css/layout-rtl.css b/core/themes/bartik/css/layout-rtl.css similarity index 100% rename from themes/bartik/css/layout-rtl.css rename to core/themes/bartik/css/layout-rtl.css diff --git a/themes/bartik/css/layout.css b/core/themes/bartik/css/layout.css similarity index 100% rename from themes/bartik/css/layout.css rename to core/themes/bartik/css/layout.css diff --git a/themes/bartik/css/maintenance-page.css b/core/themes/bartik/css/maintenance-page.css similarity index 100% rename from themes/bartik/css/maintenance-page.css rename to core/themes/bartik/css/maintenance-page.css diff --git a/themes/bartik/css/print.css b/core/themes/bartik/css/print.css similarity index 100% rename from themes/bartik/css/print.css rename to core/themes/bartik/css/print.css diff --git a/themes/bartik/css/style-rtl.css b/core/themes/bartik/css/style-rtl.css similarity index 100% rename from themes/bartik/css/style-rtl.css rename to core/themes/bartik/css/style-rtl.css diff --git a/themes/bartik/css/style.css b/core/themes/bartik/css/style.css similarity index 100% rename from themes/bartik/css/style.css rename to core/themes/bartik/css/style.css diff --git a/themes/bartik/images/add.png b/core/themes/bartik/images/add.png similarity index 100% rename from themes/bartik/images/add.png rename to core/themes/bartik/images/add.png diff --git a/themes/bartik/images/buttons.png b/core/themes/bartik/images/buttons.png similarity index 100% rename from themes/bartik/images/buttons.png rename to core/themes/bartik/images/buttons.png diff --git a/themes/bartik/images/comment-arrow-rtl.gif b/core/themes/bartik/images/comment-arrow-rtl.gif similarity index 100% rename from themes/bartik/images/comment-arrow-rtl.gif rename to core/themes/bartik/images/comment-arrow-rtl.gif diff --git a/themes/bartik/images/comment-arrow.gif b/core/themes/bartik/images/comment-arrow.gif similarity index 100% rename from themes/bartik/images/comment-arrow.gif rename to core/themes/bartik/images/comment-arrow.gif diff --git a/themes/bartik/images/search-button.png b/core/themes/bartik/images/search-button.png similarity index 100% rename from themes/bartik/images/search-button.png rename to core/themes/bartik/images/search-button.png diff --git a/themes/bartik/images/tabs-border.png b/core/themes/bartik/images/tabs-border.png similarity index 100% rename from themes/bartik/images/tabs-border.png rename to core/themes/bartik/images/tabs-border.png diff --git a/themes/bartik/logo.png b/core/themes/bartik/logo.png similarity index 100% rename from themes/bartik/logo.png rename to core/themes/bartik/logo.png diff --git a/themes/bartik/screenshot.png b/core/themes/bartik/screenshot.png similarity index 100% rename from themes/bartik/screenshot.png rename to core/themes/bartik/screenshot.png diff --git a/themes/bartik/template.php b/core/themes/bartik/template.php similarity index 100% rename from themes/bartik/template.php rename to core/themes/bartik/template.php diff --git a/themes/bartik/templates/comment-wrapper.tpl.php b/core/themes/bartik/templates/comment-wrapper.tpl.php similarity index 100% rename from themes/bartik/templates/comment-wrapper.tpl.php rename to core/themes/bartik/templates/comment-wrapper.tpl.php diff --git a/themes/bartik/templates/comment.tpl.php b/core/themes/bartik/templates/comment.tpl.php similarity index 100% rename from themes/bartik/templates/comment.tpl.php rename to core/themes/bartik/templates/comment.tpl.php diff --git a/themes/bartik/templates/maintenance-page.tpl.php b/core/themes/bartik/templates/maintenance-page.tpl.php similarity index 100% rename from themes/bartik/templates/maintenance-page.tpl.php rename to core/themes/bartik/templates/maintenance-page.tpl.php diff --git a/themes/bartik/templates/node.tpl.php b/core/themes/bartik/templates/node.tpl.php similarity index 100% rename from themes/bartik/templates/node.tpl.php rename to core/themes/bartik/templates/node.tpl.php diff --git a/themes/bartik/templates/page.tpl.php b/core/themes/bartik/templates/page.tpl.php similarity index 100% rename from themes/bartik/templates/page.tpl.php rename to core/themes/bartik/templates/page.tpl.php diff --git a/themes/engines/phptemplate/phptemplate.engine b/core/themes/engines/phptemplate/phptemplate.engine similarity index 100% rename from themes/engines/phptemplate/phptemplate.engine rename to core/themes/engines/phptemplate/phptemplate.engine diff --git a/themes/garland/color/base.png b/core/themes/garland/color/base.png similarity index 100% rename from themes/garland/color/base.png rename to core/themes/garland/color/base.png diff --git a/themes/garland/color/color.inc b/core/themes/garland/color/color.inc similarity index 100% rename from themes/garland/color/color.inc rename to core/themes/garland/color/color.inc diff --git a/themes/garland/color/preview.css b/core/themes/garland/color/preview.css similarity index 100% rename from themes/garland/color/preview.css rename to core/themes/garland/color/preview.css diff --git a/themes/garland/color/preview.png b/core/themes/garland/color/preview.png similarity index 100% rename from themes/garland/color/preview.png rename to core/themes/garland/color/preview.png diff --git a/themes/garland/comment.tpl.php b/core/themes/garland/comment.tpl.php similarity index 100% rename from themes/garland/comment.tpl.php rename to core/themes/garland/comment.tpl.php diff --git a/themes/garland/fix-ie-rtl.css b/core/themes/garland/fix-ie-rtl.css similarity index 100% rename from themes/garland/fix-ie-rtl.css rename to core/themes/garland/fix-ie-rtl.css diff --git a/themes/garland/fix-ie.css b/core/themes/garland/fix-ie.css similarity index 100% rename from themes/garland/fix-ie.css rename to core/themes/garland/fix-ie.css diff --git a/themes/garland/garland.info b/core/themes/garland/garland.info similarity index 100% rename from themes/garland/garland.info rename to core/themes/garland/garland.info diff --git a/themes/garland/images/bg-bar-white.png b/core/themes/garland/images/bg-bar-white.png similarity index 100% rename from themes/garland/images/bg-bar-white.png rename to core/themes/garland/images/bg-bar-white.png diff --git a/themes/garland/images/bg-bar.png b/core/themes/garland/images/bg-bar.png similarity index 100% rename from themes/garland/images/bg-bar.png rename to core/themes/garland/images/bg-bar.png diff --git a/themes/garland/images/bg-content-left.png b/core/themes/garland/images/bg-content-left.png similarity index 100% rename from themes/garland/images/bg-content-left.png rename to core/themes/garland/images/bg-content-left.png diff --git a/themes/garland/images/bg-content-right.png b/core/themes/garland/images/bg-content-right.png similarity index 100% rename from themes/garland/images/bg-content-right.png rename to core/themes/garland/images/bg-content-right.png diff --git a/themes/garland/images/bg-content.png b/core/themes/garland/images/bg-content.png similarity index 100% rename from themes/garland/images/bg-content.png rename to core/themes/garland/images/bg-content.png diff --git a/themes/garland/images/bg-navigation-item-hover.png b/core/themes/garland/images/bg-navigation-item-hover.png similarity index 100% rename from themes/garland/images/bg-navigation-item-hover.png rename to core/themes/garland/images/bg-navigation-item-hover.png diff --git a/themes/garland/images/bg-navigation-item.png b/core/themes/garland/images/bg-navigation-item.png similarity index 100% rename from themes/garland/images/bg-navigation-item.png rename to core/themes/garland/images/bg-navigation-item.png diff --git a/themes/garland/images/bg-navigation.png b/core/themes/garland/images/bg-navigation.png similarity index 100% rename from themes/garland/images/bg-navigation.png rename to core/themes/garland/images/bg-navigation.png diff --git a/themes/garland/images/bg-tab.png b/core/themes/garland/images/bg-tab.png similarity index 100% rename from themes/garland/images/bg-tab.png rename to core/themes/garland/images/bg-tab.png diff --git a/themes/garland/images/body.png b/core/themes/garland/images/body.png similarity index 100% rename from themes/garland/images/body.png rename to core/themes/garland/images/body.png diff --git a/themes/garland/images/gradient-inner.png b/core/themes/garland/images/gradient-inner.png similarity index 100% rename from themes/garland/images/gradient-inner.png rename to core/themes/garland/images/gradient-inner.png diff --git a/themes/garland/images/menu-collapsed-rtl.gif b/core/themes/garland/images/menu-collapsed-rtl.gif similarity index 100% rename from themes/garland/images/menu-collapsed-rtl.gif rename to core/themes/garland/images/menu-collapsed-rtl.gif diff --git a/themes/garland/images/menu-collapsed.gif b/core/themes/garland/images/menu-collapsed.gif similarity index 100% rename from themes/garland/images/menu-collapsed.gif rename to core/themes/garland/images/menu-collapsed.gif diff --git a/themes/garland/images/menu-expanded.gif b/core/themes/garland/images/menu-expanded.gif similarity index 100% rename from themes/garland/images/menu-expanded.gif rename to core/themes/garland/images/menu-expanded.gif diff --git a/themes/garland/images/menu-leaf.gif b/core/themes/garland/images/menu-leaf.gif similarity index 100% rename from themes/garland/images/menu-leaf.gif rename to core/themes/garland/images/menu-leaf.gif diff --git a/themes/garland/images/task-list.png b/core/themes/garland/images/task-list.png similarity index 100% rename from themes/garland/images/task-list.png rename to core/themes/garland/images/task-list.png diff --git a/themes/garland/logo.png b/core/themes/garland/logo.png similarity index 100% rename from themes/garland/logo.png rename to core/themes/garland/logo.png diff --git a/themes/garland/maintenance-page.tpl.php b/core/themes/garland/maintenance-page.tpl.php similarity index 100% rename from themes/garland/maintenance-page.tpl.php rename to core/themes/garland/maintenance-page.tpl.php diff --git a/themes/garland/node.tpl.php b/core/themes/garland/node.tpl.php similarity index 100% rename from themes/garland/node.tpl.php rename to core/themes/garland/node.tpl.php diff --git a/themes/garland/page.tpl.php b/core/themes/garland/page.tpl.php similarity index 100% rename from themes/garland/page.tpl.php rename to core/themes/garland/page.tpl.php diff --git a/themes/garland/print.css b/core/themes/garland/print.css similarity index 100% rename from themes/garland/print.css rename to core/themes/garland/print.css diff --git a/themes/garland/screenshot.png b/core/themes/garland/screenshot.png similarity index 100% rename from themes/garland/screenshot.png rename to core/themes/garland/screenshot.png diff --git a/themes/garland/style-rtl.css b/core/themes/garland/style-rtl.css similarity index 100% rename from themes/garland/style-rtl.css rename to core/themes/garland/style-rtl.css diff --git a/themes/garland/style.css b/core/themes/garland/style.css similarity index 100% rename from themes/garland/style.css rename to core/themes/garland/style.css diff --git a/themes/garland/template.php b/core/themes/garland/template.php similarity index 100% rename from themes/garland/template.php rename to core/themes/garland/template.php diff --git a/themes/garland/theme-settings.php b/core/themes/garland/theme-settings.php similarity index 100% rename from themes/garland/theme-settings.php rename to core/themes/garland/theme-settings.php diff --git a/themes/seven/ie.css b/core/themes/seven/ie.css similarity index 100% rename from themes/seven/ie.css rename to core/themes/seven/ie.css diff --git a/themes/seven/ie6.css b/core/themes/seven/ie6.css similarity index 100% rename from themes/seven/ie6.css rename to core/themes/seven/ie6.css diff --git a/themes/seven/images/add.png b/core/themes/seven/images/add.png similarity index 100% rename from themes/seven/images/add.png rename to core/themes/seven/images/add.png diff --git a/themes/seven/images/arrow-asc.png b/core/themes/seven/images/arrow-asc.png similarity index 100% rename from themes/seven/images/arrow-asc.png rename to core/themes/seven/images/arrow-asc.png diff --git a/themes/seven/images/arrow-desc.png b/core/themes/seven/images/arrow-desc.png similarity index 100% rename from themes/seven/images/arrow-desc.png rename to core/themes/seven/images/arrow-desc.png diff --git a/themes/seven/images/arrow-next.png b/core/themes/seven/images/arrow-next.png similarity index 100% rename from themes/seven/images/arrow-next.png rename to core/themes/seven/images/arrow-next.png diff --git a/themes/seven/images/arrow-prev.png b/core/themes/seven/images/arrow-prev.png similarity index 100% rename from themes/seven/images/arrow-prev.png rename to core/themes/seven/images/arrow-prev.png diff --git a/themes/seven/images/buttons.png b/core/themes/seven/images/buttons.png similarity index 100% rename from themes/seven/images/buttons.png rename to core/themes/seven/images/buttons.png diff --git a/themes/seven/images/fc-rtl.png b/core/themes/seven/images/fc-rtl.png similarity index 100% rename from themes/seven/images/fc-rtl.png rename to core/themes/seven/images/fc-rtl.png diff --git a/themes/seven/images/fc.png b/core/themes/seven/images/fc.png similarity index 100% rename from themes/seven/images/fc.png rename to core/themes/seven/images/fc.png diff --git a/themes/seven/images/list-item.png b/core/themes/seven/images/list-item.png similarity index 100% rename from themes/seven/images/list-item.png rename to core/themes/seven/images/list-item.png diff --git a/themes/seven/images/task-check.png b/core/themes/seven/images/task-check.png similarity index 100% rename from themes/seven/images/task-check.png rename to core/themes/seven/images/task-check.png diff --git a/themes/seven/images/task-item.png b/core/themes/seven/images/task-item.png similarity index 100% rename from themes/seven/images/task-item.png rename to core/themes/seven/images/task-item.png diff --git a/themes/seven/images/ui-icons-222222-256x240.png b/core/themes/seven/images/ui-icons-222222-256x240.png similarity index 100% rename from themes/seven/images/ui-icons-222222-256x240.png rename to core/themes/seven/images/ui-icons-222222-256x240.png diff --git a/themes/seven/images/ui-icons-454545-256x240.png b/core/themes/seven/images/ui-icons-454545-256x240.png similarity index 100% rename from themes/seven/images/ui-icons-454545-256x240.png rename to core/themes/seven/images/ui-icons-454545-256x240.png diff --git a/themes/seven/images/ui-icons-800000-256x240.png b/core/themes/seven/images/ui-icons-800000-256x240.png similarity index 100% rename from themes/seven/images/ui-icons-800000-256x240.png rename to core/themes/seven/images/ui-icons-800000-256x240.png diff --git a/themes/seven/images/ui-icons-888888-256x240.png b/core/themes/seven/images/ui-icons-888888-256x240.png similarity index 100% rename from themes/seven/images/ui-icons-888888-256x240.png rename to core/themes/seven/images/ui-icons-888888-256x240.png diff --git a/themes/seven/images/ui-icons-ffffff-256x240.png b/core/themes/seven/images/ui-icons-ffffff-256x240.png similarity index 100% rename from themes/seven/images/ui-icons-ffffff-256x240.png rename to core/themes/seven/images/ui-icons-ffffff-256x240.png diff --git a/themes/seven/jquery.ui.theme.css b/core/themes/seven/jquery.ui.theme.css similarity index 100% rename from themes/seven/jquery.ui.theme.css rename to core/themes/seven/jquery.ui.theme.css diff --git a/themes/seven/logo.png b/core/themes/seven/logo.png similarity index 100% rename from themes/seven/logo.png rename to core/themes/seven/logo.png diff --git a/themes/seven/maintenance-page.tpl.php b/core/themes/seven/maintenance-page.tpl.php similarity index 100% rename from themes/seven/maintenance-page.tpl.php rename to core/themes/seven/maintenance-page.tpl.php diff --git a/themes/seven/page.tpl.php b/core/themes/seven/page.tpl.php similarity index 100% rename from themes/seven/page.tpl.php rename to core/themes/seven/page.tpl.php diff --git a/themes/seven/reset.css b/core/themes/seven/reset.css similarity index 100% rename from themes/seven/reset.css rename to core/themes/seven/reset.css diff --git a/themes/seven/screenshot.png b/core/themes/seven/screenshot.png similarity index 100% rename from themes/seven/screenshot.png rename to core/themes/seven/screenshot.png diff --git a/themes/seven/seven.info b/core/themes/seven/seven.info similarity index 100% rename from themes/seven/seven.info rename to core/themes/seven/seven.info diff --git a/themes/seven/style-rtl.css b/core/themes/seven/style-rtl.css similarity index 100% rename from themes/seven/style-rtl.css rename to core/themes/seven/style-rtl.css diff --git a/themes/seven/style.css b/core/themes/seven/style.css similarity index 100% rename from themes/seven/style.css rename to core/themes/seven/style.css diff --git a/themes/seven/template.php b/core/themes/seven/template.php similarity index 100% rename from themes/seven/template.php rename to core/themes/seven/template.php diff --git a/themes/seven/vertical-tabs-rtl.css b/core/themes/seven/vertical-tabs-rtl.css similarity index 100% rename from themes/seven/vertical-tabs-rtl.css rename to core/themes/seven/vertical-tabs-rtl.css diff --git a/themes/seven/vertical-tabs.css b/core/themes/seven/vertical-tabs.css similarity index 100% rename from themes/seven/vertical-tabs.css rename to core/themes/seven/vertical-tabs.css diff --git a/themes/stark/README.txt b/core/themes/stark/README.txt similarity index 100% rename from themes/stark/README.txt rename to core/themes/stark/README.txt diff --git a/themes/stark/layout.css b/core/themes/stark/layout.css similarity index 100% rename from themes/stark/layout.css rename to core/themes/stark/layout.css diff --git a/themes/stark/logo.png b/core/themes/stark/logo.png similarity index 100% rename from themes/stark/logo.png rename to core/themes/stark/logo.png diff --git a/themes/stark/screenshot.png b/core/themes/stark/screenshot.png similarity index 100% rename from themes/stark/screenshot.png rename to core/themes/stark/screenshot.png diff --git a/themes/stark/stark.info b/core/themes/stark/stark.info similarity index 100% rename from themes/stark/stark.info rename to core/themes/stark/stark.info diff --git a/themes/tests/README.txt b/core/themes/tests/README.txt similarity index 100% rename from themes/tests/README.txt rename to core/themes/tests/README.txt diff --git a/themes/tests/test_theme/template.php b/core/themes/tests/test_theme/template.php similarity index 100% rename from themes/tests/test_theme/template.php rename to core/themes/tests/test_theme/template.php diff --git a/themes/tests/test_theme/test_theme.info b/core/themes/tests/test_theme/test_theme.info similarity index 100% rename from themes/tests/test_theme/test_theme.info rename to core/themes/tests/test_theme/test_theme.info diff --git a/themes/tests/update_test_basetheme/update_test_basetheme.info b/core/themes/tests/update_test_basetheme/update_test_basetheme.info similarity index 100% rename from themes/tests/update_test_basetheme/update_test_basetheme.info rename to core/themes/tests/update_test_basetheme/update_test_basetheme.info diff --git a/themes/tests/update_test_subtheme/update_test_subtheme.info b/core/themes/tests/update_test_subtheme/update_test_subtheme.info similarity index 100% rename from themes/tests/update_test_subtheme/update_test_subtheme.info rename to core/themes/tests/update_test_subtheme/update_test_subtheme.info diff --git a/update.php b/core/update.php similarity index 100% rename from update.php rename to core/update.php diff --git a/xmlrpc.php b/core/xmlrpc.php similarity index 100% rename from xmlrpc.php rename to core/xmlrpc.php -- 1.7.4.1 From ea35d76f74cd36de963cc9fadd147e0210a54103 Mon Sep 17 00:00:00 2001 From: Nathan Haug Date: Mon, 11 Apr 2011 13:20:36 -0700 Subject: [PATCH 2/4] Issue #22336 by quicksketch, scor, boombatower, and rfay. Move all core Drupal files under a core subdirectory. --- core/includes/theme.inc | 12 ++++++------ core/modules/simpletest/simpletest.pages.inc | 14 +++++++------- core/modules/update/update.report.inc | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 9bd7062..7079ac0 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1054,7 +1054,7 @@ function drupal_find_theme_templates($cache, $extension, $path) { // Escape the periods in the extension. $regex = '/' . str_replace('.', '\.', $extension) . '$/'; // Get a listing of all template files in the path to search. - $files = drupal_system_listing($regex, $path, 'name', 0); + $files = file_scan_directory($path, $regex, array('key' => 'name')); // Find templates that implement registered theme hooks and include that in // what is returned so that the registry knows that the theme has this @@ -1214,7 +1214,7 @@ function theme_get_setting($setting_name, $theme = NULL) { $cache[$theme]['favicon'] = file_create_url($favicon); } else { - $cache[$theme]['favicon'] = file_create_url('misc/favicon.ico'); + $cache[$theme]['favicon'] = file_create_url('core/misc/favicon.ico'); } } elseif ($cache[$theme]['favicon_path']) { @@ -1627,7 +1627,7 @@ function theme_table($variables) { // Add sticky headers, if applicable. if (count($header) && $sticky) { - drupal_add_js('misc/tableheader.js'); + drupal_add_js('core/misc/tableheader.js'); // Add 'sticky-enabled' class to the table to identify it for JS. // This is needed to target tables constructed by this function. $attributes['class'][] = 'sticky-enabled'; @@ -1760,10 +1760,10 @@ function theme_table($variables) { */ function theme_tablesort_indicator($variables) { if ($variables['style'] == "asc") { - return theme('image', array('path' => 'misc/arrow-asc.png', 'width' => 13, 'height' => 13, 'alt' => t('sort ascending'), 'title' => t('sort ascending'))); + return theme('image', array('path' => 'core/misc/arrow-asc.png', 'width' => 13, 'height' => 13, 'alt' => t('sort ascending'), 'title' => t('sort ascending'))); } else { - return theme('image', array('path' => 'misc/arrow-desc.png', 'width' => 13, 'height' => 13, 'alt' => t('sort descending'), 'title' => t('sort descending'))); + return theme('image', array('path' => 'core/misc/arrow-desc.png', 'width' => 13, 'height' => 13, 'alt' => t('sort descending'), 'title' => t('sort descending'))); } } @@ -1876,7 +1876,7 @@ function theme_more_help_link($variables) { */ function theme_feed_icon($variables) { $text = t('Subscribe to @feed-title', array('@feed-title' => $variables['title'])); - if ($image = theme('image', array('path' => 'misc/feed.png', 'width' => 16, 'height' => 16, 'alt' => $text))) { + if ($image = theme('image', array('path' => 'core/misc/feed.png', 'width' => 16, 'height' => 16, 'alt' => $text))) { return l($image, $variables['url'], array('html' => TRUE, 'attributes' => array('class' => array('feed-icon'), 'title' => $text))); } } diff --git a/core/modules/simpletest/simpletest.pages.inc b/core/modules/simpletest/simpletest.pages.inc index 31d0b2c..f8e93c6 100644 --- a/core/modules/simpletest/simpletest.pages.inc +++ b/core/modules/simpletest/simpletest.pages.inc @@ -70,7 +70,7 @@ function theme_simpletest_test_table($variables) { drupal_add_css(drupal_get_path('module', 'simpletest') . '/simpletest.css'); drupal_add_js(drupal_get_path('module', 'simpletest') . '/simpletest.js'); - drupal_add_js('misc/tableselect.js'); + drupal_add_js('core/misc/tableselect.js'); // Create header for test selection table. $header = array( @@ -82,8 +82,8 @@ function theme_simpletest_test_table($variables) { // Define the images used to expand/collapse the test groups. $js = array( 'images' => array( - theme('image', array('path' => 'misc/menu-collapsed.png', 'width' => 7, 'height' => 7, 'alt' => t('Expand'), 'title' => t('Expand'))) . ' (' . t('Expand') . ')', - theme('image', array('path' => 'misc/menu-expanded.png', 'width' => 7, 'height' => 7, 'alt' => t('Collapse'), 'title' => t('Collapse'))) . ' (' . t('Collapse') . ')', + theme('image', array('path' => 'core/misc/menu-collapsed.png', 'width' => 7, 'height' => 7, 'alt' => t('Expand'), 'title' => t('Expand'))) . ' (' . t('Expand') . ')', + theme('image', array('path' => 'core/misc/menu-expanded.png', 'width' => 7, 'height' => 7, 'alt' => t('Collapse'), 'title' => t('Collapse'))) . ' (' . t('Collapse') . ')', ), ); @@ -426,10 +426,10 @@ function simpletest_result_status_image($status) { if (!isset($map)) { $map = array( - 'pass' => theme('image', array('path' => 'misc/watchdog-ok.png', 'width' => 18, 'height' => 18, 'alt' => t('Pass'))), - 'fail' => theme('image', array('path' => 'misc/watchdog-error.png', 'width' => 18, 'height' => 18, 'alt' => t('Fail'))), - 'exception' => theme('image', array('path' => 'misc/watchdog-warning.png', 'width' => 18, 'height' => 18, 'alt' => t('Exception'))), - 'debug' => theme('image', array('path' => 'misc/watchdog-warning.png', 'width' => 18, 'height' => 18, 'alt' => t('Debug'))), + 'pass' => theme('image', array('path' => 'core/misc/watchdog-ok.png', 'width' => 18, 'height' => 18, 'alt' => t('Pass'))), + 'fail' => theme('image', array('path' => 'core/misc/watchdog-error.png', 'width' => 18, 'height' => 18, 'alt' => t('Fail'))), + 'exception' => theme('image', array('path' => 'core/misc/watchdog-warning.png', 'width' => 18, 'height' => 18, 'alt' => t('Exception'))), + 'debug' => theme('image', array('path' => 'core/misc/watchdog-warning.png', 'width' => 18, 'height' => 18, 'alt' => t('Debug'))), ); } if (isset($map[$status])) { diff --git a/core/modules/update/update.report.inc b/core/modules/update/update.report.inc index 3f5933a..02150e9 100644 --- a/core/modules/update/update.report.inc +++ b/core/modules/update/update.report.inc @@ -57,25 +57,25 @@ function theme_update_report($variables) { switch ($project['status']) { case UPDATE_CURRENT: $class = 'ok'; - $icon = theme('image', array('path' => 'misc/watchdog-ok.png', 'width' => 18, 'height' => 18, 'alt' => t('ok'), 'title' => t('ok'))); + $icon = theme('image', array('path' => 'core/misc/watchdog-ok.png', 'width' => 18, 'height' => 18, 'alt' => t('ok'), 'title' => t('ok'))); break; case UPDATE_UNKNOWN: case UPDATE_FETCH_PENDING: case UPDATE_NOT_FETCHED: $class = 'unknown'; - $icon = theme('image', array('path' => 'misc/watchdog-warning.png', 'width' => 18, 'height' => 18, 'alt' => t('warning'), 'title' => t('warning'))); + $icon = theme('image', array('path' => 'core/misc/watchdog-warning.png', 'width' => 18, 'height' => 18, 'alt' => t('warning'), 'title' => t('warning'))); break; case UPDATE_NOT_SECURE: case UPDATE_REVOKED: case UPDATE_NOT_SUPPORTED: $class = 'error'; - $icon = theme('image', array('path' => 'misc/watchdog-error.png', 'width' => 18, 'height' => 18, 'alt' => t('error'), 'title' => t('error'))); + $icon = theme('image', array('path' => 'core/misc/watchdog-error.png', 'width' => 18, 'height' => 18, 'alt' => t('error'), 'title' => t('error'))); break; case UPDATE_NOT_CHECKED: case UPDATE_NOT_CURRENT: default: $class = 'warning'; - $icon = theme('image', array('path' => 'misc/watchdog-warning.png', 'width' => 18, 'height' => 18, 'alt' => t('warning'), 'title' => t('warning'))); + $icon = theme('image', array('path' => 'core/misc/watchdog-warning.png', 'width' => 18, 'height' => 18, 'alt' => t('warning'), 'title' => t('warning'))); break; } -- 1.7.4.1 From 370f5a155fa00b533b84d8728f9a895996ad09fc Mon Sep 17 00:00:00 2001 From: Nathan Haug Date: Wed, 4 May 2011 19:11:56 -0600 Subject: [PATCH 3/4] Issue #22336 by quicksketch, scor, boombatower, and rfay. Move all core Drupal files under a core subdirectory. --- README.txt | 4 +- core/INSTALL.txt | 4 +- core/UPGRADE.txt | 4 +- core/authorize.php | 25 ++-- core/cron.php | 5 +- core/includes/bootstrap.inc | 44 ++++--- core/includes/common.inc | 63 +++++----- core/includes/database/database.inc | 2 +- core/includes/database/schema.inc | 3 +- core/includes/database/sqlite/database.inc | 2 +- core/includes/errors.inc | 2 +- core/includes/file.inc | 2 +- core/includes/form.inc | 10 +- core/includes/install.core.inc | 58 ++++---- core/includes/install.inc | 20 ++-- core/includes/locale.inc | 8 +- core/includes/module.inc | 6 +- core/includes/registry.inc | 8 +- core/includes/session.inc | 2 +- core/includes/stream_wrappers.inc | 2 +- core/includes/theme.maintenance.inc | 16 +- core/includes/update.inc | 8 +- core/install.php | 5 +- core/modules/aggregator/aggregator.test | 8 +- .../modules/block/block-admin-display-form.tpl.php | 2 +- core/modules/field/field.module | 12 +- core/modules/field/tests/field.test | 2 +- core/modules/field/tests/field_test.module | 6 +- core/modules/field_ui/field_ui.admin.inc | 2 +- core/modules/file/file.module | 2 +- core/modules/image/image.module | 4 +- core/modules/locale/locale.admin.inc | 10 +- core/modules/locale/locale.module | 16 +- core/modules/locale/locale.test | 14 +- core/modules/node/node.admin.inc | 2 +- core/modules/profile/profile.test | 2 +- core/modules/search/search.test | 2 +- core/modules/simpletest/drupal_web_test_case.php | 6 +- core/modules/simpletest/simpletest.module | 4 +- core/modules/simpletest/simpletest.test | 4 +- core/modules/simpletest/tests/batch.test | 2 +- core/modules/simpletest/tests/bootstrap.test | 6 +- core/modules/simpletest/tests/common.test | 46 +++--- core/modules/simpletest/tests/common_test.module | 4 +- core/modules/simpletest/tests/error.test | 10 +- core/modules/simpletest/tests/file.test | 24 ++-- core/modules/simpletest/tests/form.test | 4 +- core/modules/simpletest/tests/form_test.module | 2 +- core/modules/simpletest/tests/graph.test | 2 +- core/modules/simpletest/tests/http.php | 6 +- core/modules/simpletest/tests/https.php | 6 +- core/modules/simpletest/tests/password.test | 2 +- core/modules/simpletest/tests/system_test.module | 2 +- core/modules/simpletest/tests/theme.test | 4 +- core/modules/simpletest/tests/update.test | 6 +- core/modules/simpletest/tests/upgrade/upgrade.test | 4 +- core/modules/system/system.admin.inc | 16 +- core/modules/system/system.api.php | 8 +- core/modules/system/system.install | 6 +- core/modules/system/system.module | 142 ++++++++++---------- core/modules/system/system.test | 26 ++-- core/modules/system/system.updater.inc | 4 +- core/modules/translation/translation.pages.inc | 2 +- core/modules/update/update.authorize.inc | 2 +- core/modules/update/update.module | 8 +- core/modules/user/user.module | 6 +- core/modules/user/user.test | 4 +- core/scripts/cron-curl.sh | 2 +- core/scripts/cron-lynx.sh | 2 +- core/scripts/drupal.sh | 2 +- core/scripts/password-hash.sh | 5 +- core/scripts/run-tests.sh | 7 +- core/themes/seven/template.php | 12 +- core/update.php | 47 ++++--- core/xmlrpc.php | 9 +- index.php | 4 +- sites/default/default.settings.php | 2 +- 77 files changed, 437 insertions(+), 410 deletions(-) diff --git a/README.txt b/README.txt index 921f99c..904084a 100644 --- a/README.txt +++ b/README.txt @@ -17,7 +17,7 @@ Drupal community at http://drupal.org/community. Legal information about Drupal: * Know your rights when using Drupal: - See LICENSE.txt in the same directory as this document. + See LICENSE.txt in the "core" directory. * Learn about the Drupal trademark and logo policy: http://drupal.com/trademark @@ -35,7 +35,7 @@ core) available for download. More about configuration: * Install, upgrade, and maintain Drupal: - See INSTALL.txt and UPGRADE.txt in the same directory as this document. + See INSTALL.txt and UPGRADE.txt in the "core" directory. * Learn about how to use Drupal to create your site: http://drupal.org/documentation * Download contributed modules to sites/all/modules to extend Drupal's diff --git a/core/INSTALL.txt b/core/INSTALL.txt index 7b526e3..8678a4a 100644 --- a/core/INSTALL.txt +++ b/core/INSTALL.txt @@ -286,9 +286,9 @@ INSTALLATION crontab utility on Unix/Linux systems. The following crontab line uses the wget command to visit the cron.php page, and runs each hour, on the hour: - 0 * * * * wget -O - -q -t 1 http://example.com/cron.php?cron_key=YOURKEY + 0 * * * * wget -O - -q -t 1 http://example.com/core/cron.php?cron_key=YOURKEY - Replace the text "http://example.com/cron.php?cron_key=YOURKEY" in the + Replace the text "http://example.com/core/cron.php?cron_key=YOURKEY" in the example with the full URL displayed under "Cron maintenance tasks" on the "Status report" page. diff --git a/core/UPGRADE.txt b/core/UPGRADE.txt index edef885..ba93d42 100644 --- a/core/UPGRADE.txt +++ b/core/UPGRADE.txt @@ -85,7 +85,7 @@ following the instructions in the INTRODUCTION section at the top of this file: 5. Re-apply any modifications to files such as .htaccess or robots.txt. -6. Run update.php by visiting http://www.example.com/update.php (replace +6. Run update.php by visiting http://www.example.com/core/update.php (replace www.example.com with your domain name). This will update the core database tables. @@ -189,7 +189,7 @@ following the instructions in the INTRODUCTION section at the top of this file: sites/default/settings.php -13. Run update.php by visiting http://www.example.com/update.php (replace +13. Run update.php by visiting http://www.example.com/core/update.php (replace www.example.com with your domain name). This will update the core database tables. diff --git a/core/authorize.php b/core/authorize.php index cd3df50..56d1aff 100644 --- a/core/authorize.php +++ b/core/authorize.php @@ -20,6 +20,9 @@ * @link authorize Authorized operation helper functions @endlink */ +// Change the directory to the Drupal root. +chdir('..'); + /** * Root directory of Drupal installation. */ @@ -59,12 +62,12 @@ function authorize_access_allowed() { // *** Real work of the script begins here. *** -require_once DRUPAL_ROOT . '/includes/bootstrap.inc'; -require_once DRUPAL_ROOT . '/includes/session.inc'; -require_once DRUPAL_ROOT . '/includes/common.inc'; -require_once DRUPAL_ROOT . '/includes/file.inc'; -require_once DRUPAL_ROOT . '/includes/module.inc'; -require_once DRUPAL_ROOT . '/includes/ajax.inc'; +require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; +require_once DRUPAL_ROOT . '/core/includes/session.inc'; +require_once DRUPAL_ROOT . '/core/includes/common.inc'; +require_once DRUPAL_ROOT . '/core/includes/file.inc'; +require_once DRUPAL_ROOT . '/core/includes/module.inc'; +require_once DRUPAL_ROOT . '/core/includes/ajax.inc'; // We prepare only a minimal bootstrap. This includes the database and // variables, however, so we have access to the class autoloader registry. @@ -75,8 +78,8 @@ global $conf; // We have to enable the user and system modules, even to check access and // display errors via the maintainence theme. -$module_list['system']['filename'] = 'modules/system/system.module'; -$module_list['user']['filename'] = 'modules/user/user.module'; +$module_list['system']['filename'] = 'core/modules/system/system.module'; +$module_list['user']['filename'] = 'core/modules/user/user.module'; module_list(TRUE, FALSE, FALSE, $module_list); drupal_load('module', 'system'); drupal_load('module', 'user'); @@ -95,10 +98,10 @@ $show_messages = TRUE; if (authorize_access_allowed()) { // Load both the Form API and Batch API. - require_once DRUPAL_ROOT . '/includes/form.inc'; - require_once DRUPAL_ROOT . '/includes/batch.inc'; + require_once DRUPAL_ROOT . '/core/includes/form.inc'; + require_once DRUPAL_ROOT . '/core/includes/batch.inc'; // Load the code that drives the authorize process. - require_once DRUPAL_ROOT . '/includes/authorize.inc'; + require_once DRUPAL_ROOT . '/core/includes/authorize.inc'; // For the sake of Batch API and a few other low-level functions, we need to // initialize the URL path into $_GET['q']. However, we do not want to raise diff --git a/core/cron.php b/core/cron.php index c6ce531..fa9aa14 100644 --- a/core/cron.php +++ b/core/cron.php @@ -5,12 +5,15 @@ * Handles incoming requests to fire off regularly-scheduled tasks (cron jobs). */ +// Change the directory to the Drupal root. +chdir('..'); + /** * Root directory of Drupal installation. */ define('DRUPAL_ROOT', getcwd()); -include_once DRUPAL_ROOT . '/includes/bootstrap.inc'; +include_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); if (!isset($_GET['cron_key']) || variable_get('cron_key', 'drupal') != $_GET['cron_key']) { diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 6322b91..ce4e2a1 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -575,7 +575,15 @@ function drupal_settings_initialize() { // $_SERVER['SCRIPT_NAME'] can, in contrast to $_SERVER['PHP_SELF'], not // be modified by a visitor. if ($dir = rtrim(dirname($_SERVER['SCRIPT_NAME']), '\/')) { - $base_path = $dir; + // Remove "core" directory if present, allowing install.php, update.php, + // cron.php and others to auto-detect a base path. + $core_position = strrpos($dir, '/core'); + if ($core_position !== FALSE && strlen($dir) - 5 == $core_position) { + $base_path = substr($dir, 0, $core_position); + } + else { + $base_path = $dir; + } $base_url .= $base_path; $base_path .= '/'; } @@ -703,7 +711,7 @@ function drupal_get_filename($type, $name, $filename = NULL) { } if (!function_exists('drupal_system_listing')) { - require_once DRUPAL_ROOT . '/includes/common.inc'; + require_once DRUPAL_ROOT . '/core/includes/common.inc'; } // Scan the appropriate directories for all files with the requested // extension, not just the file we are currently looking for. This @@ -1443,7 +1451,7 @@ function watchdog_exception($type, Exception $exception, $message = NULL, $varia $variables = array(); } - require_once DRUPAL_ROOT . '/includes/errors.inc'; + require_once DRUPAL_ROOT . '/core/includes/errors.inc'; $variables += _drupal_decode_exception($exception); watchdog($type, $message, $variables, $severity, $link); } @@ -1911,7 +1919,7 @@ function drupal_bootstrap($phase = NULL, $new_phase = TRUE) { break; case DRUPAL_BOOTSTRAP_SESSION: - require_once DRUPAL_ROOT . '/' . variable_get('session_inc', 'includes/session.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('session_inc', 'core/includes/session.inc'); drupal_session_initialize(); break; @@ -1924,7 +1932,7 @@ function drupal_bootstrap($phase = NULL, $new_phase = TRUE) { break; case DRUPAL_BOOTSTRAP_FULL: - require_once DRUPAL_ROOT . '/includes/common.inc'; + require_once DRUPAL_ROOT . '/core/includes/common.inc'; _drupal_bootstrap_full(); break; } @@ -1963,7 +1971,7 @@ function drupal_get_user_timezone() { * An array that points to the active symbol table at the point the error occurred. */ function _drupal_error_handler($error_level, $message, $filename, $line, $context) { - require_once DRUPAL_ROOT . '/includes/errors.inc'; + require_once DRUPAL_ROOT . '/core/includes/errors.inc'; _drupal_error_handler_real($error_level, $message, $filename, $line, $context); } @@ -1978,7 +1986,7 @@ function _drupal_error_handler($error_level, $message, $filename, $line, $contex * The exception object that was thrown. */ function _drupal_exception_handler($exception) { - require_once DRUPAL_ROOT . '/includes/errors.inc'; + require_once DRUPAL_ROOT . '/core/includes/errors.inc'; try { // Log the message to the watchdog and return an error page to the user. @@ -2018,7 +2026,7 @@ function _drupal_bootstrap_page_cache() { // Allow specifying special cache handlers in settings.php, like // using memcached or files for storing cache information. - require_once DRUPAL_ROOT . '/includes/cache.inc'; + require_once DRUPAL_ROOT . '/core/includes/cache.inc'; foreach (variable_get('cache_backends', array()) as $include) { require_once DRUPAL_ROOT . '/' . $include; } @@ -2074,8 +2082,8 @@ function _drupal_bootstrap_database() { // installed yet (i.e., if no $databases array has been defined in the // settings.php file) and we are not already installing. if (empty($GLOBALS['databases']) && !drupal_installation_attempted()) { - include_once DRUPAL_ROOT . '/includes/install.inc'; - install_goto('install.php'); + include_once DRUPAL_ROOT . '/core/includes/install.inc'; + install_goto('core/install.php'); } // The user agent header is used to pass a database prefix in the request when @@ -2108,7 +2116,7 @@ function _drupal_bootstrap_database() { // Initialize the database system. Note that the connection // won't be initialized until it is actually requested. - require_once DRUPAL_ROOT . '/includes/database/database.inc'; + require_once DRUPAL_ROOT . '/core/includes/database/database.inc'; // Register autoload functions so that we can access classes and interfaces. // The database autoload routine comes first so that we can load the database @@ -2125,13 +2133,13 @@ function _drupal_bootstrap_variables() { global $conf; // Initialize the lock system. - require_once DRUPAL_ROOT . '/' . variable_get('lock_inc', 'includes/lock.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('lock_inc', 'core/includes/lock.inc'); lock_initialize(); // Load variables from the database, but do not overwrite variables set in settings.php. $conf = variable_initialize(isset($conf) ? $conf : array()); // Load bootstrap modules. - require_once DRUPAL_ROOT . '/includes/module.inc'; + require_once DRUPAL_ROOT . '/core/includes/module.inc'; module_load_all(TRUE); } @@ -2223,7 +2231,7 @@ function drupal_generate_test_ua($prefix) { * @see _drupal_maintenance_theme() */ function drupal_maintenance_theme() { - require_once DRUPAL_ROOT . '/includes/theme.maintenance.inc'; + require_once DRUPAL_ROOT . '/core/includes/theme.maintenance.inc'; _drupal_maintenance_theme(); } @@ -2263,7 +2271,7 @@ function drupal_language_initialize() { $GLOBALS[$type] = $default; } if (drupal_multilingual()) { - include_once DRUPAL_ROOT . '/includes/language.inc'; + include_once DRUPAL_ROOT . '/core/includes/language.inc'; foreach ($types as $type) { $GLOBALS[$type] = language_initialize($type); } @@ -2548,7 +2556,7 @@ function drupal_get_schema($table = NULL, $rebuild = FALSE) { module_load_all_includes('install'); } - require_once DRUPAL_ROOT . '/includes/common.inc'; + require_once DRUPAL_ROOT . '/core/includes/common.inc'; // Invoke hook_schema for all modules. foreach (module_implements('schema') as $module) { // Cast the result of hook_schema() to an array, as a NULL return value @@ -2722,7 +2730,7 @@ function registry_rebuild() { * @see registry_rebuild() */ function registry_update() { - require_once DRUPAL_ROOT . '/includes/registry.inc'; + require_once DRUPAL_ROOT . '/core/includes/registry.inc'; _registry_update(); } @@ -2964,7 +2972,7 @@ function _drupal_shutdown_function() { } catch (Exception $exception) { // If we are displaying errors, then do so with no possibility of a further uncaught exception being thrown. - require_once DRUPAL_ROOT . '/includes/errors.inc'; + require_once DRUPAL_ROOT . '/core/includes/errors.inc'; if (error_displayable()) { print '

Uncaught exception thrown in shutdown function.

'; print '

' . _drupal_render_exception_safe($exception) . '

'; diff --git a/core/includes/common.inc b/core/includes/common.inc index b6ea297..8fe5d77 100644 --- a/core/includes/common.inc +++ b/core/includes/common.inc @@ -1552,7 +1552,7 @@ function filter_xss_bad_protocol($string, $decode = TRUE) { // string that needs decoding. if ($decode) { if (!function_exists('decode_entities')) { - require_once DRUPAL_ROOT . '/includes/unicode.inc'; + require_once DRUPAL_ROOT . '/core/includes/unicode.inc'; } $string = decode_entities($string); @@ -2770,9 +2770,9 @@ function drupal_add_html_head_link($attributes, $header = FALSE) { * - 'basename': Force a basename for the file being added. Modules are * expected to use stylesheets with unique filenames, but integration of * external libraries may make this impossible. The basename of - * 'modules/node/node.css' is 'node.css'. If the external library "node.js" - * ships with a 'node.css', then a different, unique basename would be - * 'node.js.css'. + * 'core/modules/node/node.css' is 'node.css'. If the external library + * "node.js" ships with a 'node.css', then a different, unique basename + * would be 'node.js.css'. * - 'group': A number identifying the group in which to add the stylesheet. * Available constants are: * - CSS_SYSTEM: Any system-layer CSS. @@ -3805,8 +3805,8 @@ function drupal_region_class($region) { * * Examples: * @code - * drupal_add_js('misc/collapse.js'); - * drupal_add_js('misc/collapse.js', 'file'); + * drupal_add_js('core/misc/collapse.js'); + * drupal_add_js('core/misc/collapse.js', 'file'); * drupal_add_js('jQuery(document).ready(function () { alert("Hello!"); });', 'inline'); * drupal_add_js('jQuery(document).ready(function () { alert("Hello!"); });', * array('type' => 'inline', 'scope' => 'footer', 'weight' => 5) @@ -3962,8 +3962,8 @@ function drupal_add_js($data = NULL, $options = NULL) { 'every_page' => TRUE, 'weight' => 0, ), - 'misc/drupal.js' => array( - 'data' => 'misc/drupal.js', + 'core/misc/drupal.js' => array( + 'data' => 'core/misc/drupal.js', 'type' => 'file', 'scope' => 'header', 'group' => JS_LIBRARY, @@ -4686,7 +4686,7 @@ function drupal_add_tabledrag($table_id, $action, $relationship, $group, $subgro // to ensure that table drag behaviors are registered before any module // uses it. drupal_add_library('system', 'jquery.cookie'); - drupal_add_js('misc/tabledrag.js', array('weight' => -1)); + drupal_add_js('core/misc/tabledrag.js', array('weight' => -1)); $js_added = TRUE; } @@ -4883,20 +4883,20 @@ function _drupal_bootstrap_full() { return; } $called = TRUE; - require_once DRUPAL_ROOT . '/' . variable_get('path_inc', 'includes/path.inc'); - require_once DRUPAL_ROOT . '/includes/theme.inc'; - require_once DRUPAL_ROOT . '/includes/pager.inc'; - require_once DRUPAL_ROOT . '/' . variable_get('menu_inc', 'includes/menu.inc'); - require_once DRUPAL_ROOT . '/includes/tablesort.inc'; - require_once DRUPAL_ROOT . '/includes/file.inc'; - require_once DRUPAL_ROOT . '/includes/unicode.inc'; - require_once DRUPAL_ROOT . '/includes/image.inc'; - require_once DRUPAL_ROOT . '/includes/form.inc'; - require_once DRUPAL_ROOT . '/includes/mail.inc'; - require_once DRUPAL_ROOT . '/includes/actions.inc'; - require_once DRUPAL_ROOT . '/includes/ajax.inc'; - require_once DRUPAL_ROOT . '/includes/token.inc'; - require_once DRUPAL_ROOT . '/includes/errors.inc'; + require_once DRUPAL_ROOT . '/' . variable_get('path_inc', 'core/includes/path.inc'); + require_once DRUPAL_ROOT . '/core/includes/theme.inc'; + require_once DRUPAL_ROOT . '/core/includes/pager.inc'; + require_once DRUPAL_ROOT . '/' . variable_get('menu_inc', 'core/includes/menu.inc'); + require_once DRUPAL_ROOT . '/core/includes/tablesort.inc'; + require_once DRUPAL_ROOT . '/core/includes/file.inc'; + require_once DRUPAL_ROOT . '/core/includes/unicode.inc'; + require_once DRUPAL_ROOT . '/core/includes/image.inc'; + require_once DRUPAL_ROOT . '/core/includes/form.inc'; + require_once DRUPAL_ROOT . '/core/includes/mail.inc'; + require_once DRUPAL_ROOT . '/core/includes/actions.inc'; + require_once DRUPAL_ROOT . '/core/includes/ajax.inc'; + require_once DRUPAL_ROOT . '/core/includes/token.inc'; + require_once DRUPAL_ROOT . '/core/includes/errors.inc'; // Detect string handling method unicode_check(); @@ -5098,7 +5098,7 @@ function drupal_cron_cleanup() { * The preg_match() regular expression for the files to find. * @param string $directory * The subdirectory name in which the files are found. For example, - * 'modules' will search in sub-directories of the top-level /modules + * 'core/modules' will search in sub-directories of the /core/modules * directory, sub-directories of /sites/all/modules/, etc. * @param string $key * The key to be used for the associative array returned. Possible values are @@ -5108,7 +5108,8 @@ function drupal_cron_cleanup() { * @param int $min_depth * Minimum depth of directories to return files from, relative to each * directory searched. For instance, a minimum depth of 2 would find modules - * inside /modules/node/tests, but not modules directly in /modules/node. + * inside /core/modules/node/tests, but not modules directly in + * /core/modules/node. * * @return array * An associative array of file objects, keyed on the chosen key. Each element @@ -5119,16 +5120,16 @@ function drupal_cron_cleanup() { */ function drupal_system_listing($mask, $directory, $key = 'name', $min_depth = 1) { $config = conf_path(); - - $profile = drupal_get_profile(); - - $searchdir = array($directory); $files = array(); + // Search for the directory in core. + $searchdir = array('core/' . $directory); + // The 'profiles' directory contains pristine collections of modules and // themes as organized by a distribution. It is pristine in the same way // that /modules is pristine for core; users should avoid changing anything // there in favor of sites/all or sites/ directories. + $profile = drupal_get_profile(); if (file_exists("profiles/$profile/$directory")) { $searchdir[] = "profiles/$profile/$directory"; } @@ -5142,7 +5143,7 @@ function drupal_system_listing($mask, $directory, $key = 'name', $min_depth = 1) // Get current list of items if (!function_exists('file_scan_directory')) { - require_once DRUPAL_ROOT . '/includes/file.inc'; + require_once DRUPAL_ROOT . '/core/includes/file.inc'; } foreach ($searchdir as $dir) { $files_to_add = file_scan_directory($dir, $mask, array('key' => $key, 'min_depth' => $min_depth)); @@ -7681,7 +7682,7 @@ function entity_form_submit_build_entity($entity_type, $entity, $form, &$form_st * failed. See xmlrpc_error(). */ function xmlrpc($url, $args, $options = array()) { - require_once DRUPAL_ROOT . '/includes/xmlrpc.inc'; + require_once DRUPAL_ROOT . '/core/includes/xmlrpc.inc'; return _xmlrpc($url, $args, $options); } diff --git a/core/includes/database/database.inc b/core/includes/database/database.inc index 4539b37..fbfb181 100644 --- a/core/includes/database/database.inc +++ b/core/includes/database/database.inc @@ -1568,7 +1568,7 @@ abstract class Database { // We cannot rely on the registry yet, because the registry requires an // open database connection. $driver_class = 'DatabaseConnection_' . $driver; - require_once DRUPAL_ROOT . '/includes/database/' . $driver . '/database.inc'; + require_once DRUPAL_ROOT . '/core/includes/database/' . $driver . '/database.inc'; $new_connection = new $driver_class(self::$databaseInfo[$key][$target]); $new_connection->setTarget($target); $new_connection->setKey($key); diff --git a/core/includes/database/schema.inc b/core/includes/database/schema.inc index de1b2f5..b34713f 100644 --- a/core/includes/database/schema.inc +++ b/core/includes/database/schema.inc @@ -245,7 +245,8 @@ abstract class DatabaseSchema implements QueryPlaceholderInterface { * method should be overwritten by a database driver if the database provider * uses alternate methods. Because information_schema.tables is used in a few * different functions, a database driver will only need to override this function - * to make all the others work. For example see includes/databases/mysql/schema.inc. + * to make all the others work. For example see + * core/includes/databases/mysql/schema.inc. * * @param $table_name * The name of the table in question. diff --git a/core/includes/database/sqlite/database.inc b/core/includes/database/sqlite/database.inc index cf3b955..caaabf9 100644 --- a/core/includes/database/sqlite/database.inc +++ b/core/includes/database/sqlite/database.inc @@ -10,7 +10,7 @@ * @{ */ -include_once DRUPAL_ROOT . '/includes/database/prefetch.inc'; +include_once DRUPAL_ROOT . '/core/includes/database/prefetch.inc'; /** * Specific SQLite implementation of DatabaseConnection. diff --git a/core/includes/errors.inc b/core/includes/errors.inc index 3a97b6d..bdb6058 100644 --- a/core/includes/errors.inc +++ b/core/includes/errors.inc @@ -70,7 +70,7 @@ function _drupal_error_handler_real($error_level, $message, $filename, $line, $c $caller = _drupal_get_last_caller(debug_backtrace()); if (!function_exists('filter_xss_admin')) { - require_once DRUPAL_ROOT . '/includes/common.inc'; + require_once DRUPAL_ROOT . '/core/includes/common.inc'; } // We treat recoverable errors as fatal. diff --git a/core/includes/file.inc b/core/includes/file.inc index 26a6c41..a7b5029 100644 --- a/core/includes/file.inc +++ b/core/includes/file.inc @@ -12,7 +12,7 @@ * File API is needed before a bootstrap, or in an alternate order (e.g. * maintenance theme). */ -require_once DRUPAL_ROOT . '/includes/stream_wrappers.inc'; +require_once DRUPAL_ROOT . '/core/includes/stream_wrappers.inc'; /** * @defgroup file File interface diff --git a/core/includes/form.inc b/core/includes/form.inc index 3f83b8e..13498c6 100644 --- a/core/includes/form.inc +++ b/core/includes/form.inc @@ -3162,7 +3162,7 @@ function theme_tableselect($variables) { // checkboxes/radios in the first table column. if ($element['#js_select']) { // Add a "Select all" checkbox. - drupal_add_js('misc/tableselect.js'); + drupal_add_js('core/misc/tableselect.js'); array_unshift($header, array('class' => array('select-all'))); } else { @@ -3329,7 +3329,7 @@ function form_process_machine_name($element, &$form_state) { ), ), ); - $element['#attached']['js'][] = 'misc/machine-name.js'; + $element['#attached']['js'][] = 'core/misc/machine-name.js'; $element['#attached']['js'][] = $js_settings; return $element; @@ -4283,7 +4283,7 @@ function batch_process($redirect = NULL, $url = 'batch', $redirect_callback = 'd else { // Non-progressive execution: bypass the whole progressbar workflow // and execute the batch in one pass. - require_once DRUPAL_ROOT . '/includes/batch.inc'; + require_once DRUPAL_ROOT . '/core/includes/batch.inc'; _batch_process(); } } @@ -4352,8 +4352,8 @@ function _batch_queue($batch_set) { // sure the files are manually included. if (!isset($queues)) { $queues = array(); - require_once DRUPAL_ROOT . '/modules/system/system.queue.inc'; - require_once DRUPAL_ROOT . '/includes/batch.queue.inc'; + require_once DRUPAL_ROOT . '/core/modules/system/system.queue.inc'; + require_once DRUPAL_ROOT . '/core/includes/batch.queue.inc'; } if (isset($batch_set['queue'])) { diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index a74dfdf..4696446 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -222,7 +222,7 @@ function install_begin_request(&$install_state) { } // Allow command line scripts to override server variables used by Drupal. - require_once DRUPAL_ROOT . '/includes/bootstrap.inc'; + require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; if (!$install_state['interactive']) { drupal_override_server_variables($install_state['server']); } @@ -240,23 +240,23 @@ function install_begin_request(&$install_state) { // This must go after drupal_bootstrap(), which unsets globals! global $conf; - require_once DRUPAL_ROOT . '/modules/system/system.install'; - require_once DRUPAL_ROOT . '/includes/common.inc'; - require_once DRUPAL_ROOT . '/includes/file.inc'; - require_once DRUPAL_ROOT . '/includes/install.inc'; - require_once DRUPAL_ROOT . '/' . variable_get('path_inc', 'includes/path.inc'); + require_once DRUPAL_ROOT . '/core/modules/system/system.install'; + require_once DRUPAL_ROOT . '/core/includes/common.inc'; + require_once DRUPAL_ROOT . '/core/includes/file.inc'; + require_once DRUPAL_ROOT . '/core/includes/install.inc'; + require_once DRUPAL_ROOT . '/' . variable_get('path_inc', 'core/includes/path.inc'); // Load module basics (needed for hook invokes). - include_once DRUPAL_ROOT . '/includes/module.inc'; - include_once DRUPAL_ROOT . '/includes/session.inc'; + include_once DRUPAL_ROOT . '/core/includes/module.inc'; + include_once DRUPAL_ROOT . '/core/includes/session.inc'; // Set up $language, so t() caller functions will still work. drupal_language_initialize(); - include_once DRUPAL_ROOT . '/includes/entity.inc'; - require_once DRUPAL_ROOT . '/includes/ajax.inc'; - $module_list['system']['filename'] = 'modules/system/system.module'; - $module_list['user']['filename'] = 'modules/user/user.module'; + include_once DRUPAL_ROOT . '/core/includes/entity.inc'; + require_once DRUPAL_ROOT . '/core/includes/ajax.inc'; + $module_list['system']['filename'] = 'core/modules/system/system.module'; + $module_list['user']['filename'] = 'core/modules/user/user.module'; module_list(TRUE, FALSE, FALSE, $module_list); drupal_load('module', 'system'); drupal_load('module', 'user'); @@ -270,8 +270,8 @@ function install_begin_request(&$install_state) { // continue using the cache implementation they started with) and also // because any data put in the cache during the installer is inherently // suspect, due to the fact that Drupal is not fully set up yet. - require_once DRUPAL_ROOT . '/includes/cache.inc'; - require_once DRUPAL_ROOT . '/includes/cache-install.inc'; + require_once DRUPAL_ROOT . '/core/includes/cache.inc'; + require_once DRUPAL_ROOT . '/core/includes/cache-install.inc'; $conf['cache_default_class'] = 'DrupalFakeCache'; // Prepare for themed output. We need to run this at the beginning of the @@ -287,7 +287,7 @@ function install_begin_request(&$install_state) { if ($install_state['settings_verified']) { // Initialize the database system. Note that the connection // won't be initialized until it is actually requested. - require_once DRUPAL_ROOT . '/includes/database/database.inc'; + require_once DRUPAL_ROOT . '/core/includes/database/database.inc'; // Verify the last completed task in the database, if there is one. $task = install_verify_completed_task(); @@ -377,7 +377,7 @@ function install_run_task($task, &$install_state) { $function = $task['function']; if ($task['type'] == 'form') { - require_once DRUPAL_ROOT . '/includes/form.inc'; + require_once DRUPAL_ROOT . '/core/includes/form.inc'; if ($install_state['interactive']) { // For interactive forms, build the form and ensure that it will not // redirect, since the installer handles its own redirection only after @@ -448,7 +448,7 @@ function install_run_task($task, &$install_state) { // If we are in the middle of processing this batch, keep sending back // any output from the batch process, until the task is complete. elseif ($current_batch == $function) { - include_once DRUPAL_ROOT . '/includes/batch.inc'; + include_once DRUPAL_ROOT . '/core/includes/batch.inc'; $output = _batch_page(); // The task is complete when we try to access the batch page and receive // FALSE in return, since this means we are at a URL where we are no @@ -656,7 +656,7 @@ function install_tasks_to_display($install_state) { * @see install_full_redirect_url() */ function install_redirect_url($install_state) { - return 'install.php?' . drupal_http_build_query($install_state['parameters']); + return 'core/install.php?' . drupal_http_build_query($install_state['parameters']); } /** @@ -1009,7 +1009,7 @@ function install_select_profile(&$install_state) { // yet), rather just a convenience method for setting parameters in the // URL. if ($install_state['interactive']) { - include_once DRUPAL_ROOT . '/includes/form.inc'; + include_once DRUPAL_ROOT . '/core/includes/form.inc'; drupal_set_title(st('Select an installation profile')); $form = drupal_get_form('install_select_profile_form', $install_state['profiles']); return drupal_render($form); @@ -1185,7 +1185,7 @@ function install_select_locale(&$install_state) { $output .= ''; } else { - include_once DRUPAL_ROOT . '/includes/form.inc'; + include_once DRUPAL_ROOT . '/core/includes/form.inc'; $elements = drupal_get_form('install_select_locale_form', $locales, $profilename); $output = drupal_render($elements); } @@ -1219,7 +1219,7 @@ function install_select_locale(&$install_state) { // URL. if ($install_state['interactive']) { drupal_set_title(st('Choose language')); - include_once DRUPAL_ROOT . '/includes/form.inc'; + include_once DRUPAL_ROOT . '/core/includes/form.inc'; $elements = drupal_get_form('install_select_locale_form', $locales, $profilename); return drupal_render($elements); } @@ -1234,7 +1234,7 @@ function install_select_locale(&$install_state) { * Form API array definition for language selection. */ function install_select_locale_form($form, &$form_state, $locales, $profilename) { - include_once DRUPAL_ROOT . '/includes/iso.inc'; + include_once DRUPAL_ROOT . '/core/includes/iso.inc'; $languages = _locale_get_predefined_list(); foreach ($locales as $locale) { $name = $locale->langcode; @@ -1372,10 +1372,10 @@ function install_profile_modules(&$install_state) { * The batch definition, if there are language files to import. */ function install_import_locales(&$install_state) { - include_once DRUPAL_ROOT . '/includes/locale.inc'; + include_once DRUPAL_ROOT . '/core/includes/locale.inc'; $install_locale = $install_state['parameters']['locale']; - include_once DRUPAL_ROOT . '/includes/iso.inc'; + include_once DRUPAL_ROOT . '/core/includes/iso.inc'; $predefined = _locale_get_predefined_list(); if (!isset($predefined[$install_locale])) { // Drupal does not know about this language, so we prefill its values with @@ -1433,7 +1433,7 @@ function install_configure_form($form, &$form_state, &$install_state) { drupal_add_js(drupal_get_path('module', 'system') . '/system.js'); // Add JavaScript time zone detection. - drupal_add_js('misc/timezone.js'); + drupal_add_js('core/misc/timezone.js'); // We add these strings as settings because JavaScript translation does not // work on install time. drupal_add_js(array('copyFieldValue' => array('edit-site-mail' => array('edit-account-mail'))), 'setting'); @@ -1467,7 +1467,7 @@ function install_configure_form($form, &$form_state, &$install_state) { * The batch definition, if there are language files to import. */ function install_import_locales_remaining(&$install_state) { - include_once DRUPAL_ROOT . '/includes/locale.inc'; + include_once DRUPAL_ROOT . '/core/includes/locale.inc'; // Collect files to import for this language. Skip components already covered // in the initial batch set. $install_locale = $install_state['parameters']['locale']; @@ -1628,7 +1628,7 @@ function install_check_requirements($install_state) { 'title' => st('Settings file'), 'value' => st('The settings file does not exist.'), 'severity' => REQUIREMENT_ERROR, - 'description' => st('The @drupal installer requires that you create a settings file as part of the installation process. Copy the %default_file file to %file. More details about installing Drupal are available in INSTALL.txt.', array('@drupal' => drupal_install_profile_distribution_name(), '%file' => $file, '%default_file' => $default_settings_file, '@install_txt' => base_path() . 'INSTALL.txt')), + 'description' => st('The @drupal installer requires that you create a settings file as part of the installation process. Copy the %default_file file to %file. More details about installing Drupal are available in INSTALL.txt.', array('@drupal' => drupal_install_profile_distribution_name(), '%file' => $file, '%default_file' => $default_settings_file, '@install_txt' => base_path() . 'core/INSTALL.txt')), ); } else { @@ -1656,7 +1656,7 @@ function install_check_requirements($install_state) { 'title' => st('Settings file'), 'value' => st('The settings file is owned by the web server.'), 'severity' => REQUIREMENT_ERROR, - 'description' => st('The @drupal installer failed to create a settings file with proper file ownership. Log on to your web server, remove the existing %file file, and create a new one by copying the %default_file file to %file. More details about installing Drupal are available in INSTALL.txt. If you have problems with the file permissions on your server, consult the online handbook.', array('@drupal' => drupal_install_profile_distribution_name(), '%file' => $file, '%default_file' => $default_settings_file, '@install_txt' => base_path() . 'INSTALL.txt', '@handbook_url' => 'http://drupal.org/server-permissions')), + 'description' => st('The @drupal installer failed to create a settings file with proper file ownership. Log on to your web server, remove the existing %file file, and create a new one by copying the %default_file file to %file. More details about installing Drupal are available in INSTALL.txt. If you have problems with the file permissions on your server, consult the online handbook.', array('@drupal' => drupal_install_profile_distribution_name(), '%file' => $file, '%default_file' => $default_settings_file, '@install_txt' => base_path() . 'core/INSTALL.txt', '@handbook_url' => 'http://drupal.org/server-permissions')), ); } } @@ -1668,7 +1668,7 @@ function install_check_requirements($install_state) { * Forms API array definition for site configuration. */ function _install_configure_form($form, &$form_state, &$install_state) { - include_once DRUPAL_ROOT . '/includes/locale.inc'; + include_once DRUPAL_ROOT . '/core/includes/locale.inc'; $form['site_information'] = array( '#type' => 'fieldset', diff --git a/core/includes/install.inc b/core/includes/install.inc index 14b5d7e..dad5402 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -212,7 +212,7 @@ function drupal_install_profile_distribution_name() { * @return * The auto-detected $base_url that should be configured in settings.php */ -function drupal_detect_baseurl($file = 'install.php') { +function drupal_detect_baseurl($file = 'core/install.php') { $proto = $_SERVER['HTTPS'] ? 'https://' : 'http://'; $host = $_SERVER['SERVER_NAME']; $port = ($_SERVER['SERVER_PORT'] == 80 ? '' : ':' . $_SERVER['SERVER_PORT']); @@ -247,13 +247,13 @@ function drupal_detect_database_types() { function drupal_get_database_types() { $databases = array(); - // We define a driver as a directory in /includes/database that in turn + // We define a driver as a directory in /core/includes/database that in turn // contains a database.inc file. That allows us to drop in additional drivers // without modifying the installer. // Because we have no registry yet, we need to also include the install.inc // file for the driver explicitly. - require_once DRUPAL_ROOT . '/includes/database/database.inc'; - foreach (file_scan_directory(DRUPAL_ROOT . '/includes/database', '/^[a-z]*$/i', array('recurse' => FALSE)) as $file) { + require_once DRUPAL_ROOT . '/core/includes/database/database.inc'; + foreach (file_scan_directory(DRUPAL_ROOT . '/core/includes/database', '/^[a-z]*$/i', array('recurse' => FALSE)) as $file) { if (file_exists($file->uri . '/database.inc') && file_exists($file->uri . '/install.inc')) { $drivers[$file->filename] = $file->uri; } @@ -665,8 +665,8 @@ function drupal_verify_profile($install_state) { $profile = $install_state['parameters']['profile']; $locale = $install_state['parameters']['locale']; - include_once DRUPAL_ROOT . '/includes/file.inc'; - include_once DRUPAL_ROOT . '/includes/common.inc'; + include_once DRUPAL_ROOT . '/core/includes/file.inc'; + include_once DRUPAL_ROOT . '/core/includes/common.inc'; $profile_file = DRUPAL_ROOT . "/profiles/$profile/$profile.profile"; @@ -1042,7 +1042,7 @@ function drupal_install_fix_file($file, $mask, $message = TRUE) { */ function install_goto($path) { global $base_url; - include_once DRUPAL_ROOT . '/includes/common.inc'; + include_once DRUPAL_ROOT . '/core/includes/common.inc'; header('Location: ' . $base_url . '/' . $path); header('Cache-Control: no-cache'); // Not a permanent redirect. drupal_exit(); @@ -1074,7 +1074,7 @@ function st($string, array $args = array(), array $options = array()) { // that multiple files end with the same extension, even if unlikely. $po_files = file_scan_directory('./profiles/' . $install_state['parameters']['profile'] . '/translations', '/'. $install_state['parameters']['locale'] .'\.po$/', array('recurse' => FALSE)); if (count($po_files)) { - require_once DRUPAL_ROOT . '/includes/locale.inc'; + require_once DRUPAL_ROOT . '/core/includes/locale.inc'; foreach ($po_files as $po_file) { _locale_import_read_po('mem-store', $po_file); } @@ -1083,7 +1083,7 @@ function st($string, array $args = array(), array $options = array()) { } } - require_once DRUPAL_ROOT . '/includes/theme.inc'; + require_once DRUPAL_ROOT . '/core/includes/theme.inc'; // Transform arguments before inserting them foreach ($args as $key => $value) { switch ($key[0]) { @@ -1112,7 +1112,7 @@ function st($string, array $args = array(), array $options = array()) { * Array of the install profile's requirements. */ function drupal_check_profile($profile) { - include_once DRUPAL_ROOT . '/includes/file.inc'; + include_once DRUPAL_ROOT . '/core/includes/file.inc'; $profile_file = DRUPAL_ROOT . "/profiles/$profile/$profile.profile"; diff --git a/core/includes/locale.inc b/core/includes/locale.inc index 578b1b3..589cd7c 100644 --- a/core/includes/locale.inc +++ b/core/includes/locale.inc @@ -460,7 +460,7 @@ function locale_add_language($langcode, $name = NULL, $native = NULL, $direction // If name was not set, we add a predefined language. if (!isset($name)) { - include_once DRUPAL_ROOT . '/includes/iso.inc'; + include_once DRUPAL_ROOT . '/core/includes/iso.inc'; $predefined = _locale_get_predefined_list(); $name = $predefined[$langcode][0]; $native = isset($predefined[$langcode][1]) ? $predefined[$langcode][1] : $predefined[$langcode][0]; @@ -2006,7 +2006,7 @@ function _locale_translate_language_list($translation, $limit_language) { * Prepares the language code list for a select form item with only the unsupported ones */ function _locale_prepare_predefined_list() { - include_once DRUPAL_ROOT . '/includes/iso.inc'; + include_once DRUPAL_ROOT . '/core/includes/iso.inc'; $languages = language_list(); $predefined = _locale_get_predefined_list(); foreach ($predefined as $key => $value) { @@ -2138,7 +2138,7 @@ function _locale_batch_build($files, $finished = NULL, $components = array()) { 'title' => $t('Importing interface translations'), 'init_message' => $t('Starting import'), 'error_message' => $t('Error importing interface translations'), - 'file' => 'includes/locale.inc', + 'file' => 'core/includes/locale.inc', // This is not a batch API construct, but data passed along to the // installer, so we know what did we import already. '#components' => $components, @@ -2200,7 +2200,7 @@ function _locale_batch_language_finished($success, $results) { * An array of all country code => country name pairs. */ function country_get_list() { - include_once DRUPAL_ROOT . '/includes/iso.inc'; + include_once DRUPAL_ROOT . '/core/includes/iso.inc'; $countries = _country_get_predefined_list(); // Allow other modules to modify the country list. drupal_alter('countries', $countries); diff --git a/core/includes/module.inc b/core/includes/module.inc index 08749f3..59f7e1f 100644 --- a/core/includes/module.inc +++ b/core/includes/module.inc @@ -215,7 +215,7 @@ function system_list_reset() { * without this module. */ function _module_build_dependencies($files) { - require_once DRUPAL_ROOT . '/includes/graph.inc'; + require_once DRUPAL_ROOT . '/core/includes/graph.inc'; foreach ($files as $filename => $file) { $graph[$file->name]['edges'] = array(); if (isset($file->info['dependencies']) && is_array($file->info['dependencies'])) { @@ -259,7 +259,7 @@ function module_exists($module) { */ function module_load_install($module) { // Make sure the installation API is available - include_once DRUPAL_ROOT . '/includes/install.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc'; return module_load_include('install', $module); } @@ -392,7 +392,7 @@ function module_enable($module_list, $enable_dependencies = TRUE) { } // Required for module installation checks. - include_once DRUPAL_ROOT . '/includes/install.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc'; $modules_installed = array(); $modules_enabled = array(); diff --git a/core/includes/registry.inc b/core/includes/registry.inc index 3fb14fb..4bfacb2 100644 --- a/core/includes/registry.inc +++ b/core/includes/registry.inc @@ -29,9 +29,9 @@ function _registry_update() { // registry rebuild process runs. $connection_info = Database::getConnectionInfo(); $driver = $connection_info['default']['driver']; - require_once DRUPAL_ROOT . '/includes/database/query.inc'; - require_once DRUPAL_ROOT . '/includes/database/select.inc'; - require_once DRUPAL_ROOT . '/includes/database/' . $driver . '/query.inc'; + require_once DRUPAL_ROOT . '/core/includes/database/query.inc'; + require_once DRUPAL_ROOT . '/core/includes/database/select.inc'; + require_once DRUPAL_ROOT . '/core/includes/database/' . $driver . '/query.inc'; // Get current list of modules and their files. $modules = db_query("SELECT * FROM {system} WHERE type = 'module'")->fetchAll(); @@ -51,7 +51,7 @@ function _registry_update() { } } } - foreach (file_scan_directory('includes', '/\.inc$/') as $filename => $file) { + foreach (file_scan_directory('core/includes', '/\.inc$/') as $filename => $file) { $files["$filename"] = array('module' => '', 'weight' => 0); } diff --git a/core/includes/session.inc b/core/includes/session.inc index 2ede2ff..541ca67 100644 --- a/core/includes/session.inc +++ b/core/includes/session.inc @@ -216,7 +216,7 @@ function _drupal_session_write($sid, $value) { return TRUE; } catch (Exception $exception) { - require_once DRUPAL_ROOT . '/includes/errors.inc'; + require_once DRUPAL_ROOT . '/core/includes/errors.inc'; // If we are displaying errors, then do so with no possibility of a further // uncaught exception being thrown. if (error_displayable()) { diff --git a/core/includes/stream_wrappers.inc b/core/includes/stream_wrappers.inc index df380a8..170c984 100644 --- a/core/includes/stream_wrappers.inc +++ b/core/includes/stream_wrappers.inc @@ -312,7 +312,7 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface if (!isset($mapping)) { // The default file map, defined in file.mimetypes.inc is quite big. // We only load it when necessary. - include_once DRUPAL_ROOT . '/includes/file.mimetypes.inc'; + include_once DRUPAL_ROOT . '/core/includes/file.mimetypes.inc'; $mapping = file_mimetype_mapping(); } diff --git a/core/includes/theme.maintenance.inc b/core/includes/theme.maintenance.inc index 218a8ad..fcd8703 100644 --- a/core/includes/theme.maintenance.inc +++ b/core/includes/theme.maintenance.inc @@ -22,12 +22,12 @@ function _drupal_maintenance_theme() { return; } - require_once DRUPAL_ROOT . '/' . variable_get('path_inc', 'includes/path.inc'); - require_once DRUPAL_ROOT . '/includes/theme.inc'; - require_once DRUPAL_ROOT . '/includes/common.inc'; - require_once DRUPAL_ROOT . '/includes/unicode.inc'; - require_once DRUPAL_ROOT . '/includes/file.inc'; - require_once DRUPAL_ROOT . '/includes/module.inc'; + require_once DRUPAL_ROOT . '/' . variable_get('path_inc', 'core/includes/path.inc'); + require_once DRUPAL_ROOT . '/core/includes/theme.inc'; + require_once DRUPAL_ROOT . '/core/includes/common.inc'; + require_once DRUPAL_ROOT . '/core/includes/unicode.inc'; + require_once DRUPAL_ROOT . '/core/includes/file.inc'; + require_once DRUPAL_ROOT . '/core/includes/module.inc'; unicode_check(); // Install and update pages are treated differently to prevent theming overrides. @@ -39,7 +39,7 @@ function _drupal_maintenance_theme() { // environment, we need to bootstrap just enough to allow hook invocations // to work. See _drupal_log_error(). if (!class_exists('Database', FALSE)) { - require_once DRUPAL_ROOT . '/includes/database/database.inc'; + require_once DRUPAL_ROOT . '/core/includes/database/database.inc'; } // We use the default theme as the maintenance theme. If a default theme @@ -49,7 +49,7 @@ function _drupal_maintenance_theme() { // Ensure that system.module is loaded. if (!function_exists('_system_rebuild_theme_data')) { - $module_list['system']['filename'] = 'modules/system/system.module'; + $module_list['system']['filename'] = 'core/modules/system/system.module'; module_list(TRUE, FALSE, FALSE, $module_list); drupal_load('module', 'system'); } diff --git a/core/includes/update.inc b/core/includes/update.inc index f7a8fd6..1f9b0a5 100644 --- a/core/includes/update.inc +++ b/core/includes/update.inc @@ -81,7 +81,7 @@ function update_check_incompatibility($name, $type = 'module') { function update_prepare_d8_bootstrap() { // Allow the database system to work even if the registry has not been // created yet. - include_once DRUPAL_ROOT . '/includes/install.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc'; drupal_bootstrap(DRUPAL_BOOTSTRAP_DATABASE); // If the site has not updated to Drupal 8 yet, check to make sure that it is @@ -182,7 +182,7 @@ function update_do_one($module, $number, $dependency_map, &$context) { catch (Exception $e) { watchdog_exception('update', $e); - require_once DRUPAL_ROOT . '/includes/errors.inc'; + require_once DRUPAL_ROOT . '/core/includes/errors.inc'; $variables = _drupal_decode_exception($e); // The exception message is run through check_plain() by _drupal_decode_exception(). $ret['#abort'] = array('success' => FALSE, 'query' => t('%type: !message in %function (line %line of %file).', $variables)); @@ -284,7 +284,7 @@ function update_batch($start, $redirect = NULL, $url = NULL, $batch = array(), $ 'init_message' => 'Starting updates', 'error_message' => 'An unrecoverable error has occurred. You can find the error message below. It is advised to copy it to the clipboard for reference.', 'finished' => 'update_finished', - 'file' => 'includes/update.inc', + 'file' => 'core/includes/update.inc', ); batch_set($batch); batch_process($redirect, $url, $redirect_callback); @@ -432,7 +432,7 @@ function update_resolve_dependencies($starting_updates) { $graph = update_build_dependency_graph($update_functions); // Perform the depth-first search and sort the results. - require_once DRUPAL_ROOT . '/includes/graph.inc'; + require_once DRUPAL_ROOT . '/core/includes/graph.inc'; drupal_depth_first_search($graph); uasort($graph, 'drupal_sort_weight'); diff --git a/core/install.php b/core/install.php index 881ca5a..dbe8037 100644 --- a/core/install.php +++ b/core/install.php @@ -5,6 +5,9 @@ * Initiates a browser-based installation of Drupal. */ +// Change the directory to the Drupal root. +chdir('..'); + /** * Root directory of Drupal installation. */ @@ -22,5 +25,5 @@ if (version_compare(PHP_VERSION, '5.2.4') < 0) { } // Start the installer. -require_once DRUPAL_ROOT . '/includes/install.core.inc'; +require_once DRUPAL_ROOT . '/core/includes/install.core.inc'; install_drupal(); diff --git a/core/modules/aggregator/aggregator.test b/core/modules/aggregator/aggregator.test index 1ab12dc..c4f42a4 100644 --- a/core/modules/aggregator/aggregator.test +++ b/core/modules/aggregator/aggregator.test @@ -720,11 +720,11 @@ class AggregatorCronTestCase extends AggregatorTestCase { $key = variable_get('cron_key', 'drupal'); $this->createSampleNodes(); $feed = $this->createFeed(); - $this->drupalGet($base_url . '/cron.php', array('external' => TRUE, 'query' => array('cron_key' => $key))); + $this->drupalGet($base_url . '/core/cron.php', array('external' => TRUE, 'query' => array('cron_key' => $key))); $this->assertEqual(5, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid))->fetchField(), 'Expected number of items in database.'); $this->removeFeedItems($feed); $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid))->fetchField(), 'Expected number of items in database.'); - $this->drupalGet($base_url . '/cron.php', array('external' => TRUE, 'query' => array('cron_key' => $key))); + $this->drupalGet($base_url . '/core/cron.php', array('external' => TRUE, 'query' => array('cron_key' => $key))); $this->assertEqual(5, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid))->fetchField(), 'Expected number of items in database.'); // Test feed locking when queued for update. @@ -735,7 +735,7 @@ class AggregatorCronTestCase extends AggregatorTestCase { 'queued' => REQUEST_TIME, )) ->execute(); - $this->drupalGet($base_url . '/cron.php', array('external' => TRUE, 'query' => array('cron_key' => $key))); + $this->drupalGet($base_url . '/core/cron.php', array('external' => TRUE, 'query' => array('cron_key' => $key))); $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid))->fetchField(), 'Expected number of items in database.'); db_update('aggregator_feed') ->condition('fid', $feed->fid) @@ -743,7 +743,7 @@ class AggregatorCronTestCase extends AggregatorTestCase { 'queued' => 0, )) ->execute(); - $this->drupalGet($base_url . '/cron.php', array('external' => TRUE, 'query' => array('cron_key' => $key))); + $this->drupalGet($base_url . '/core/cron.php', array('external' => TRUE, 'query' => array('cron_key' => $key))); $this->assertEqual(5, db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid))->fetchField(), 'Expected number of items in database.'); } } diff --git a/core/modules/block/block-admin-display-form.tpl.php b/core/modules/block/block-admin-display-form.tpl.php index 94b6104..bb3d887 100644 --- a/core/modules/block/block-admin-display-form.tpl.php +++ b/core/modules/block/block-admin-display-form.tpl.php @@ -25,7 +25,7 @@ ?> $title) { drupal_add_tabledrag('blocks', 'match', 'sibling', 'block-region-select', 'block-region-' . $region, NULL, FALSE); diff --git a/core/modules/field/field.module b/core/modules/field/field.module index 163f448..a25edf2 100644 --- a/core/modules/field/field.module +++ b/core/modules/field/field.module @@ -17,12 +17,12 @@ class FieldException extends Exception {} * mechanism for auto-loading core APIs, so we have to load them on * every page request. */ -require_once DRUPAL_ROOT . '/modules/field/field.crud.inc'; -require_once DRUPAL_ROOT . '/modules/field/field.default.inc'; -require_once DRUPAL_ROOT . '/modules/field/field.info.inc'; -require_once DRUPAL_ROOT . '/modules/field/field.multilingual.inc'; -require_once DRUPAL_ROOT . '/modules/field/field.attach.inc'; -require_once DRUPAL_ROOT . '/modules/field/field.form.inc'; +require_once DRUPAL_ROOT . '/core/modules/field/field.crud.inc'; +require_once DRUPAL_ROOT . '/core/modules/field/field.default.inc'; +require_once DRUPAL_ROOT . '/core/modules/field/field.info.inc'; +require_once DRUPAL_ROOT . '/core/modules/field/field.multilingual.inc'; +require_once DRUPAL_ROOT . '/core/modules/field/field.attach.inc'; +require_once DRUPAL_ROOT . '/core/modules/field/field.form.inc'; /** * @defgroup field Field API diff --git a/core/modules/field/tests/field.test b/core/modules/field/tests/field.test index 97510e4..7565b8d 100644 --- a/core/modules/field/tests/field.test +++ b/core/modules/field/tests/field.test @@ -2640,7 +2640,7 @@ class FieldTranslationsTestCase extends FieldTestCase { field_create_instance($instance); $this->instance = field_read_instance('test_entity', $this->field_name, 'test_bundle'); - require_once DRUPAL_ROOT . '/includes/locale.inc'; + require_once DRUPAL_ROOT . '/core/includes/locale.inc'; for ($i = 0; $i < 3; ++$i) { locale_add_language('l' . $i, $this->randomString(), $this->randomString()); } diff --git a/core/modules/field/tests/field_test.module b/core/modules/field/tests/field_test.module index 09415e2..fedbb7b 100644 --- a/core/modules/field/tests/field_test.module +++ b/core/modules/field/tests/field_test.module @@ -13,9 +13,9 @@ * test helper functions */ -require_once DRUPAL_ROOT . '/modules/field/tests/field_test.entity.inc'; -require_once DRUPAL_ROOT . '/modules/field/tests/field_test.field.inc'; -require_once DRUPAL_ROOT . '/modules/field/tests/field_test.storage.inc'; +require_once DRUPAL_ROOT . '/core/modules/field/tests/field_test.entity.inc'; +require_once DRUPAL_ROOT . '/core/modules/field/tests/field_test.field.inc'; +require_once DRUPAL_ROOT . '/core/modules/field/tests/field_test.storage.inc'; /** * Implements hook_permission(). diff --git a/core/modules/field_ui/field_ui.admin.inc b/core/modules/field_ui/field_ui.admin.inc index 96beb13..7208869 100644 --- a/core/modules/field_ui/field_ui.admin.inc +++ b/core/modules/field_ui/field_ui.admin.inc @@ -1042,7 +1042,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund $table[$name]['settings_edit'] = $base_button + array( '#type' => 'image_button', '#name' => $name . '_formatter_settings_edit', - '#src' => 'misc/configure.png', + '#src' => 'core/misc/configure.png', '#attributes' => array('class' => array('field-formatter-settings-edit'), 'alt' => t('Edit')), '#op' => 'edit', // Do not check errors for the 'Edit' button, but make sure we get diff --git a/core/modules/file/file.module b/core/modules/file/file.module index 4002701..e5209a0 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -6,7 +6,7 @@ */ // Load all Field module hooks for File. -require_once DRUPAL_ROOT . '/modules/file/file.field.inc'; +require_once DRUPAL_ROOT . '/core/modules/file/file.field.inc'; /** * Implements hook_help(). diff --git a/core/modules/image/image.module b/core/modules/image/image.module index d2d081c..189a98c 100644 --- a/core/modules/image/image.module +++ b/core/modules/image/image.module @@ -31,7 +31,7 @@ define('IMAGE_STORAGE_EDITABLE', IMAGE_STORAGE_NORMAL | IMAGE_STORAGE_OVERRIDE); define('IMAGE_STORAGE_MODULE', IMAGE_STORAGE_OVERRIDE | IMAGE_STORAGE_DEFAULT); // Load all Field module hooks for Image. -require_once DRUPAL_ROOT . '/modules/image/image.field.inc'; +require_once DRUPAL_ROOT . '/core/modules/image/image.field.inc'; /** * Implement of hook_help(). @@ -905,7 +905,7 @@ function image_effect_definitions() { } else { $effects = array(); - include_once DRUPAL_ROOT . '/modules/image/image.effects.inc'; + include_once DRUPAL_ROOT . '/core/modules/image/image.effects.inc'; foreach (module_implements('image_effect_info') as $module) { foreach (module_invoke($module, 'image_effect_info') as $name => $effect) { // Ensure the current toolkit supports the effect. diff --git a/core/modules/locale/locale.admin.inc b/core/modules/locale/locale.admin.inc index de16133..4415bb8 100644 --- a/core/modules/locale/locale.admin.inc +++ b/core/modules/locale/locale.admin.inc @@ -321,7 +321,7 @@ function locale_languages_predefined_form_validate($form, &$form_state) { if (!isset($form_state['values']['name'])) { // Predefined language selection. - include_once DRUPAL_ROOT . '/includes/iso.inc'; + include_once DRUPAL_ROOT . '/core/includes/iso.inc'; $predefined = _locale_get_predefined_list(); if (!isset($predefined[$langcode])) { form_set_error('langcode', t('Invalid language code.')); @@ -345,7 +345,7 @@ function locale_languages_predefined_form_submit($form, &$form_state) { } else { // Predefined language selection. - include_once DRUPAL_ROOT . '/includes/iso.inc'; + include_once DRUPAL_ROOT . '/core/includes/iso.inc'; $predefined = _locale_get_predefined_list(); locale_add_language($langcode); drupal_set_message(t('The language %language has been created and can now be used. More information is available on the help screen.', array('%language' => t($predefined[$langcode][0]), '@locale-help' => url('admin/help/locale')))); @@ -487,7 +487,7 @@ function locale_languages_delete_form_submit($form, &$form_state) { * Setting for language negotiation options */ function locale_languages_configure_form() { - include_once DRUPAL_ROOT . '/includes/language.inc'; + include_once DRUPAL_ROOT . '/core/includes/language.inc'; $form = array( '#submit' => array('locale_languages_configure_form_submit'), @@ -992,7 +992,7 @@ function locale_translate_import_form_submit($form, &$form_state) { $languages = language_list('language'); $langcode = $form_state['values']['langcode']; if (!isset($languages[$langcode])) { - include_once DRUPAL_ROOT . '/includes/iso.inc'; + include_once DRUPAL_ROOT . '/core/includes/iso.inc'; $predefined = _locale_get_predefined_list(); locale_add_language($langcode); drupal_set_message(t('The language %language has been created.', array('%language' => t($predefined[$langcode][0])))); @@ -1398,7 +1398,7 @@ function locale_date_format_form($form, &$form_state, $langcode) { * Submit handler for configuring localized date formats on the locale_date_format_form. */ function locale_date_format_form_submit($form, &$form_state) { - include_once DRUPAL_ROOT . '/includes/locale.inc'; + include_once DRUPAL_ROOT . '/core/includes/locale.inc'; $langcode = $form_state['values']['langcode']; // Get list of date format types. diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module index c1cdd43..6674006 100644 --- a/core/modules/locale/locale.module +++ b/core/modules/locale/locale.module @@ -225,7 +225,7 @@ function locale_menu() { */ function locale_init() { global $conf, $language; - include_once DRUPAL_ROOT . '/includes/locale.inc'; + include_once DRUPAL_ROOT . '/core/includes/locale.inc'; // For each date type (e.g. long, short), get the localized date format // for the user's current language and override the default setting for it @@ -472,7 +472,7 @@ function locale_field_language_fallback(&$display_language, $entity, $langcode) } elseif (!empty($entity->{$field_name})) { if (!isset($fallback_candidates)) { - require_once DRUPAL_ROOT . '/includes/language.inc'; + require_once DRUPAL_ROOT . '/core/includes/language.inc'; $fallback_candidates = language_fallback_get_candidates(); } foreach ($fallback_candidates as $fallback_language) { @@ -506,7 +506,7 @@ function locale_entity_info_alter(&$entity_info) { * detected. It is used by l() as the default language if none is specified. */ function locale_language_types_info() { - require_once DRUPAL_ROOT . '/includes/locale.inc'; + require_once DRUPAL_ROOT . '/core/includes/locale.inc'; return array( LANGUAGE_TYPE_INTERFACE => array( 'name' => t('User interface text'), @@ -525,7 +525,7 @@ function locale_language_types_info() { * Implements hook_language_negotiation_info(). */ function locale_language_negotiation_info() { - $file = 'includes/locale.inc'; + $file = 'core/includes/locale.inc'; $providers = array(); $providers[LOCALE_LANGUAGE_NEGOTIATION_URL] = array( @@ -799,7 +799,7 @@ function locale_themes_enabled($themes) { * translations for. */ function locale_system_update($components) { - include_once DRUPAL_ROOT . '/includes/locale.inc'; + include_once DRUPAL_ROOT . '/core/includes/locale.inc'; if ($batch = locale_batch_by_component($components)) { batch_set($batch); } @@ -821,7 +821,7 @@ function locale_js_alter(&$javascript) { $files = $new_files = FALSE; // Require because locale_js_alter() could be called without locale_init(). - require_once DRUPAL_ROOT . '/includes/locale.inc'; + require_once DRUPAL_ROOT . '/core/includes/locale.inc'; foreach ($javascript as $item) { if ($item['type'] == 'file') { @@ -925,7 +925,7 @@ function locale_library_alter(&$libraries, $module) { * Implements hook_block_info(). */ function locale_block_info() { - include_once DRUPAL_ROOT . '/includes/language.inc'; + include_once DRUPAL_ROOT . '/core/includes/language.inc'; $block = array(); $info = language_types_info(); foreach (language_types_configurable() as $type) { @@ -975,7 +975,7 @@ function locale_url_outbound_alter(&$path, &$options, $original_path) { if (!isset($callbacks)) { $callbacks = array(); - include_once DRUPAL_ROOT . '/includes/language.inc'; + include_once DRUPAL_ROOT . '/core/includes/language.inc'; foreach (language_types_configurable() as $type) { // Get url rewriter callbacks only from enabled language providers. diff --git a/core/modules/locale/locale.test b/core/modules/locale/locale.test index 5e9e833..3acd777 100644 --- a/core/modules/locale/locale.test +++ b/core/modules/locale/locale.test @@ -364,7 +364,7 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase { $this->drupalPost($url, $edit, t('Save translations')); // Trigger JavaScript translation parsing and building. - require_once DRUPAL_ROOT . '/includes/locale.inc'; + require_once DRUPAL_ROOT . '/core/includes/locale.inc'; _locale_rebuild_js($langcode); // Retrieve the JavaScript translation hash code for the custom language to @@ -1083,7 +1083,7 @@ class LocaleInstallTest extends DrupalWebTestCase { parent::setUp('locale'); // st() lives in install.inc, so ensure that it is loaded for all tests. - require_once DRUPAL_ROOT . '/includes/install.inc'; + require_once DRUPAL_ROOT . '/core/includes/install.inc'; } /** @@ -1125,7 +1125,7 @@ class LocaleUninstallFunctionalTest extends DrupalWebTestCase { $locale_module = array('locale'); // Add a new language and optionally set it as default. - require_once DRUPAL_ROOT . '/includes/locale.inc'; + require_once DRUPAL_ROOT . '/core/includes/locale.inc'; locale_add_language('fr', 'French', 'Français', LANGUAGE_LTR, '', '', TRUE, $this->language == 'fr'); // Check the UI language. @@ -1187,7 +1187,7 @@ class LocaleUninstallFunctionalTest extends DrupalWebTestCase { $this->assertEqual($language_count, 1, t('Language count: %count', array('%count' => $language_count))); // Check language negotiation. - require_once DRUPAL_ROOT . '/includes/language.inc'; + require_once DRUPAL_ROOT . '/core/includes/language.inc'; $this->assertTrue(count(language_types()) == count(drupal_language_types()), t('Language types reset')); $language_negotiation = language_negotiation_get(LANGUAGE_TYPE_INTERFACE) == LANGUAGE_NEGOTIATION_DEFAULT; $this->assertTrue($language_negotiation, t('Interface language negotiation: %setting', array('%setting' => t($language_negotiation ? 'none' : 'set')))); @@ -1813,7 +1813,7 @@ class LocaleUILanguageNegotiationTest extends DrupalWebTestCase { function setUp() { parent::setUp('locale', 'locale_test'); - require_once DRUPAL_ROOT . '/includes/language.inc'; + require_once DRUPAL_ROOT . '/core/includes/language.inc'; drupal_load('module', 'locale'); $admin_user = $this->drupalCreateUser(array('administer languages', 'translate interface', 'access administration pages', 'administer blocks')); $this->drupalLogin($admin_user); @@ -1839,7 +1839,7 @@ class LocaleUILanguageNegotiationTest extends DrupalWebTestCase { $language_domain = 'example.cn'; // Setup the site languages by installing two languages. - require_once DRUPAL_ROOT . '/includes/locale.inc'; + require_once DRUPAL_ROOT . '/core/includes/locale.inc'; locale_add_language($language_browser_fallback); locale_add_language($language); @@ -2123,7 +2123,7 @@ class LocaleMultilingualFieldsFunctionalTest extends DrupalWebTestCase { $this->drupalLogin($admin_user); // Add a new language. - require_once DRUPAL_ROOT . '/includes/locale.inc'; + require_once DRUPAL_ROOT . '/core/includes/locale.inc'; locale_add_language('it', 'Italian', 'Italiano', LANGUAGE_LTR, '', '', TRUE, FALSE); // Enable URL language detection and selection. diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc index a6ea1b5..f0d1fe5 100644 --- a/core/modules/node/node.admin.inc +++ b/core/modules/node/node.admin.inc @@ -206,7 +206,7 @@ function node_filter_form() { $form['filters']['status']['actions']['reset'] = array('#type' => 'submit', '#value' => t('Reset')); } - drupal_add_js('misc/form.js'); + drupal_add_js('core/misc/form.js'); return $form; } diff --git a/core/modules/profile/profile.test b/core/modules/profile/profile.test index 83bed25..9c91110 100644 --- a/core/modules/profile/profile.test +++ b/core/modules/profile/profile.test @@ -345,7 +345,7 @@ class ProfileTestAutocomplete extends ProfileTestCase { // Check that autocompletion html is found on the user's profile edit page. $this->drupalGet('user/' . $this->admin_user->uid . '/edit/' . $category); $this->assertRaw($autocomplete_html, t('Autocomplete found.')); - $this->assertRaw('misc/autocomplete.js', t('Autocomplete JavaScript found.')); + $this->assertRaw('core/misc/autocomplete.js', t('Autocomplete JavaScript found.')); $this->assertRaw('class="form-text form-autocomplete"', t('Autocomplete form element class found.')); // Check the autocompletion path using the first letter of our user's profile diff --git a/core/modules/search/search.test b/core/modules/search/search.test index 4d37133..498e282 100644 --- a/core/modules/search/search.test +++ b/core/modules/search/search.test @@ -1108,7 +1108,7 @@ class SearchSimplifyTestCase extends DrupalWebTestCase { // their own lines). So the even-numbered lines should simplify to nothing, // and the odd-numbered lines we need to split into shorter chunks and // verify that simplification doesn't lose any characters. - $input = file_get_contents(DRUPAL_ROOT . '/modules/search/tests/UnicodeTest.txt'); + $input = file_get_contents(DRUPAL_ROOT . '/core/modules/search/tests/UnicodeTest.txt'); $basestrings = explode(chr(10), $input); $strings = array(); foreach ($basestrings as $key => $string) { diff --git a/core/modules/simpletest/drupal_web_test_case.php b/core/modules/simpletest/drupal_web_test_case.php index b60c682..e61e59c 100644 --- a/core/modules/simpletest/drupal_web_test_case.php +++ b/core/modules/simpletest/drupal_web_test_case.php @@ -529,7 +529,7 @@ abstract class DrupalTestCase { 'line' => $exception->getLine(), 'file' => $exception->getFile(), )); - require_once DRUPAL_ROOT . '/includes/errors.inc'; + require_once DRUPAL_ROOT . '/core/includes/errors.inc'; // The exception message is run through check_plain() by _drupal_decode_exception(). $this->error(t('%type: !message in %function (line %line of %file).', _drupal_decode_exception($exception)), 'Uncaught exception', _drupal_get_last_caller($backtrace)); } @@ -1289,7 +1289,7 @@ class DrupalWebTestCase extends DrupalTestCase { $test_info['test_run_id'] = $this->databasePrefix; $test_info['in_child_site'] = FALSE; - include_once DRUPAL_ROOT . '/includes/install.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc'; drupal_install_system(); $this->preloadRegistry(); @@ -2065,7 +2065,7 @@ class DrupalWebTestCase extends DrupalTestCase { * Runs cron in the Drupal installed by Simpletest. */ protected function cronRun() { - $this->drupalGet($GLOBALS['base_url'] . '/cron.php', array('external' => TRUE, 'query' => array('cron_key' => variable_get('cron_key', 'drupal')))); + $this->drupalGet($GLOBALS['base_url'] . '/core/cron.php', array('external' => TRUE, 'query' => array('cron_key' => variable_get('cron_key', 'drupal')))); } /** diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module index b992fd2..331d23f 100644 --- a/core/modules/simpletest/simpletest.module +++ b/core/modules/simpletest/simpletest.module @@ -95,8 +95,8 @@ function simpletest_js_alter(&$javascript) { // Since SimpleTest is a special use case for the table select, stick the // SimpleTest JavaScript above the table select. $simpletest = drupal_get_path('module', 'simpletest') . '/simpletest.js'; - if (array_key_exists($simpletest, $javascript) && array_key_exists('misc/tableselect.js', $javascript)) { - $javascript[$simpletest]['weight'] = $javascript['misc/tableselect.js']['weight'] - 1; + if (array_key_exists($simpletest, $javascript) && array_key_exists('core/misc/tableselect.js', $javascript)) { + $javascript[$simpletest]['weight'] = $javascript['core/misc/tableselect.js']['weight'] - 1; } } diff --git a/core/modules/simpletest/simpletest.test b/core/modules/simpletest/simpletest.test index f516364..00ad8bd 100644 --- a/core/modules/simpletest/simpletest.test +++ b/core/modules/simpletest/simpletest.test @@ -55,7 +55,7 @@ class SimpleTestFunctionalTest extends DrupalWebTestCase { // using the user-agent header. This is an important security check. global $base_url; - $this->drupalGet($base_url . '/install.php', array('external' => TRUE)); + $this->drupalGet($base_url . '/core/install.php', array('external' => TRUE)); $this->assertResponse(403, 'Cannot access install.php with a "simpletest" user-agent header.'); $user = $this->drupalCreateUser(); @@ -273,7 +273,7 @@ class SimpleTestFunctionalTest extends DrupalWebTestCase { $assertion['file'] = $this->asText($row->td[2]); $assertion['line'] = $this->asText($row->td[3]); $assertion['function'] = $this->asText($row->td[4]); - $ok_url = file_create_url('misc/watchdog-ok.png'); + $ok_url = file_create_url('core/misc/watchdog-ok.png'); $assertion['status'] = ($row->td[5]->img['src'] == $ok_url) ? 'Pass' : 'Fail'; $results['assertions'][] = $assertion; } diff --git a/core/modules/simpletest/tests/batch.test b/core/modules/simpletest/tests/batch.test index d1c0e0b..d5163ba 100644 --- a/core/modules/simpletest/tests/batch.test +++ b/core/modules/simpletest/tests/batch.test @@ -366,7 +366,7 @@ class BatchPercentagesUnitTestCase extends DrupalUnitTestCase { // 19999/20000 should add yet another digit and go to 99.995%. '99.995' => array('total' => 20000, 'current' => 19999), ); - require_once DRUPAL_ROOT . '/includes/batch.inc'; + require_once DRUPAL_ROOT . '/core/includes/batch.inc'; parent::setUp(); } diff --git a/core/modules/simpletest/tests/bootstrap.test b/core/modules/simpletest/tests/bootstrap.test index 14c16a9..49fae74 100644 --- a/core/modules/simpletest/tests/bootstrap.test +++ b/core/modules/simpletest/tests/bootstrap.test @@ -342,13 +342,13 @@ class BootstrapGetFilenameTestCase extends DrupalUnitTestCase { drupal_static_reset('drupal_get_filename'); // Retrieving the location of a module. - $this->assertIdentical(drupal_get_filename('module', 'php'), 'modules/php/php.module', t('Retrieve module location.')); + $this->assertIdentical(drupal_get_filename('module', 'php'), 'core/modules/php/php.module', t('Retrieve module location.')); // Retrieving the location of a theme. - $this->assertIdentical(drupal_get_filename('theme', 'stark'), 'themes/stark/stark.info', t('Retrieve theme location.')); + $this->assertIdentical(drupal_get_filename('theme', 'stark'), 'core/themes/stark/stark.info', t('Retrieve theme location.')); // Retrieving the location of a theme engine. - $this->assertIdentical(drupal_get_filename('theme_engine', 'phptemplate'), 'themes/engines/phptemplate/phptemplate.engine', t('Retrieve theme engine location.')); + $this->assertIdentical(drupal_get_filename('theme_engine', 'phptemplate'), 'core/themes/engines/phptemplate/phptemplate.engine', t('Retrieve theme engine location.')); // Retrieving a file that is definitely not stored in the database. $this->assertIdentical(drupal_get_filename('profile', 'standard'), 'profiles/standard/standard.profile', t('Retrieve install profile location.')); diff --git a/core/modules/simpletest/tests/common.test b/core/modules/simpletest/tests/common.test index 4664f04..09ea7ad 100644 --- a/core/modules/simpletest/tests/common.test +++ b/core/modules/simpletest/tests/common.test @@ -1165,10 +1165,10 @@ class JavaScriptTestCase extends DrupalWebTestCase { * Test adding a JavaScript file. */ function testAddFile() { - $javascript = drupal_add_js('misc/collapse.js'); - $this->assertTrue(array_key_exists('misc/jquery.js', $javascript), t('jQuery is added when a file is added.')); - $this->assertTrue(array_key_exists('misc/drupal.js', $javascript), t('Drupal.js is added when file is added.')); - $this->assertTrue(array_key_exists('misc/collapse.js', $javascript), t('JavaScript files are correctly added.')); + $javascript = drupal_add_js('core/misc/collapse.js'); + $this->assertTrue(array_key_exists('core/misc/jquery.js', $javascript), t('jQuery is added when a file is added.')); + $this->assertTrue(array_key_exists('core/misc/drupal.js', $javascript), t('Drupal.js is added when file is added.')); + $this->assertTrue(array_key_exists('core/misc/collapse.js', $javascript), t('JavaScript files are correctly added.')); $this->assertEqual(base_path(), $javascript['settings']['data'][0]['basePath'], t('Base path JavaScript setting is correctly set.')); } @@ -1207,7 +1207,7 @@ class JavaScriptTestCase extends DrupalWebTestCase { $javascript = drupal_get_js('header'); $this->assertTrue(strpos($javascript, 'basePath') > 0, t('Rendered JavaScript header returns basePath setting.')); - $this->assertTrue(strpos($javascript, 'misc/jquery.js') > 0, t('Rendered JavaScript header includes jQuery.')); + $this->assertTrue(strpos($javascript, 'core/misc/jquery.js') > 0, t('Rendered JavaScript header includes jQuery.')); // Test whether drupal_add_js can be used to override a previous setting. $this->assertTrue(strpos($javascript, 'commonTestShouldAppear') > 0, t('Rendered JavaScript header returns custom setting.')); @@ -1228,7 +1228,7 @@ class JavaScriptTestCase extends DrupalWebTestCase { * Test to see if resetting the JavaScript empties the cache. */ function testReset() { - drupal_add_js('misc/collapse.js'); + drupal_add_js('core/misc/collapse.js'); drupal_static_reset('drupal_add_js'); $this->assertEqual(array(), drupal_add_js(), t('Resetting the JavaScript correctly empties the cache.')); } @@ -1239,7 +1239,7 @@ class JavaScriptTestCase extends DrupalWebTestCase { function testAddInline() { $inline = 'jQuery(function () { });'; $javascript = drupal_add_js($inline, array('type' => 'inline', 'scope' => 'footer')); - $this->assertTrue(array_key_exists('misc/jquery.js', $javascript), t('jQuery is added when inline scripts are added.')); + $this->assertTrue(array_key_exists('core/misc/jquery.js', $javascript), t('jQuery is added when inline scripts are added.')); $data = end($javascript); $this->assertEqual($inline, $data['data'], t('Inline JavaScript is correctly added to the footer.')); } @@ -1269,24 +1269,24 @@ class JavaScriptTestCase extends DrupalWebTestCase { * Test drupal_add_js() sets preproccess to false when cache is set to false. */ function testNoCache() { - $javascript = drupal_add_js('misc/collapse.js', array('cache' => FALSE)); - $this->assertFalse($javascript['misc/collapse.js']['preprocess'], t('Setting cache to FALSE sets proprocess to FALSE when adding JavaScript.')); + $javascript = drupal_add_js('core/misc/collapse.js', array('cache' => FALSE)); + $this->assertFalse($javascript['core/misc/collapse.js']['preprocess'], t('Setting cache to FALSE sets proprocess to FALSE when adding JavaScript.')); } /** * Test adding a JavaScript file with a different group. */ function testDifferentGroup() { - $javascript = drupal_add_js('misc/collapse.js', array('group' => JS_THEME)); - $this->assertEqual($javascript['misc/collapse.js']['group'], JS_THEME, t('Adding a JavaScript file with a different group caches the given group.')); + $javascript = drupal_add_js('core/misc/collapse.js', array('group' => JS_THEME)); + $this->assertEqual($javascript['core/misc/collapse.js']['group'], JS_THEME, t('Adding a JavaScript file with a different group caches the given group.')); } /** * Test adding a JavaScript file with a different weight. */ function testDifferentWeight() { - $javascript = drupal_add_js('misc/collapse.js', array('weight' => 2)); - $this->assertEqual($javascript['misc/collapse.js']['weight'], 2, t('Adding a JavaScript file with a different weight caches the given weight.')); + $javascript = drupal_add_js('core/misc/collapse.js', array('weight' => 2)); + $this->assertEqual($javascript['core/misc/collapse.js']['weight'], 2, t('Adding a JavaScript file with a different weight caches the given weight.')); } /** @@ -1338,9 +1338,9 @@ class JavaScriptTestCase extends DrupalWebTestCase { // JavaScript files are sorted first by group, then by the 'every_page' // flag, then by weight (see drupal_sort_css_js()), so to test the effect of // weight, we need the other two options to be the same. - drupal_add_js('misc/collapse.js', array('group' => JS_LIBRARY, 'every_page' => TRUE, 'weight' => -21)); + drupal_add_js('core/misc/collapse.js', array('group' => JS_LIBRARY, 'every_page' => TRUE, 'weight' => -21)); $javascript = drupal_get_js(); - $this->assertTrue(strpos($javascript, 'misc/collapse.js') < strpos($javascript, 'misc/jquery.js'), t('Rendering a JavaScript file above jQuery.')); + $this->assertTrue(strpos($javascript, 'core/misc/collapse.js') < strpos($javascript, 'core/misc/jquery.js'), t('Rendering a JavaScript file above jQuery.')); } /** @@ -1350,14 +1350,14 @@ class JavaScriptTestCase extends DrupalWebTestCase { */ function testAlter() { // Add both tableselect.js and simpletest.js, with a larger weight on SimpleTest. - drupal_add_js('misc/tableselect.js'); + drupal_add_js('core/misc/tableselect.js'); drupal_add_js(drupal_get_path('module', 'simpletest') . '/simpletest.js', array('weight' => 9999)); // Render the JavaScript, testing if simpletest.js was altered to be before // tableselect.js. See simpletest_js_alter() to see where this alteration // takes place. $javascript = drupal_get_js(); - $this->assertTrue(strpos($javascript, 'simpletest.js') < strpos($javascript, 'misc/tableselect.js'), t('Altering JavaScript weight through the alter hook.')); + $this->assertTrue(strpos($javascript, 'simpletest.js') < strpos($javascript, 'core/misc/tableselect.js'), t('Altering JavaScript weight through the alter hook.')); } /** @@ -1368,8 +1368,8 @@ class JavaScriptTestCase extends DrupalWebTestCase { $this->assertTrue($result !== FALSE, t('Library was added without errors.')); $scripts = drupal_get_js(); $styles = drupal_get_css(); - $this->assertTrue(strpos($scripts, 'misc/farbtastic/farbtastic.js'), t('JavaScript of library was added to the page.')); - $this->assertTrue(strpos($styles, 'misc/farbtastic/farbtastic.css'), t('Stylesheet of library was added to the page.')); + $this->assertTrue(strpos($scripts, 'core/misc/farbtastic/farbtastic.js'), t('JavaScript of library was added to the page.')); + $this->assertTrue(strpos($styles, 'core/misc/farbtastic/farbtastic.css'), t('Stylesheet of library was added to the page.')); } /** @@ -1385,7 +1385,7 @@ class JavaScriptTestCase extends DrupalWebTestCase { // common_test_library_alter() also added a dependency on jQuery Form. drupal_add_library('system', 'farbtastic'); $scripts = drupal_get_js(); - $this->assertTrue(strpos($scripts, 'misc/jquery.form.js'), t('Altered library dependencies are added to the page.')); + $this->assertTrue(strpos($scripts, 'core/misc/jquery.form.js'), t('Altered library dependencies are added to the page.')); } /** @@ -1419,7 +1419,7 @@ class JavaScriptTestCase extends DrupalWebTestCase { $element['#attached']['library'][] = array('system', 'farbtastic'); drupal_render($element); $scripts = drupal_get_js(); - $this->assertTrue(strpos($scripts, 'misc/farbtastic/farbtastic.js'), t('The attached_library property adds the additional libraries.')); + $this->assertTrue(strpos($scripts, 'core/misc/farbtastic/farbtastic.js'), t('The attached_library property adds the additional libraries.')); } /** @@ -2096,14 +2096,14 @@ class DrupalSystemListingTestCase extends DrupalWebTestCase { // with Drupal core, the copy in the core modules directory takes // precedence. 'drupal_system_listing_incompatible_test' => array( - 'modules/simpletest/tests', + 'core/modules/simpletest/tests', 'profiles/testing/modules', ), // When both copies of the module are compatible with Drupal core, the // copy in the profile directory takes precedence. 'drupal_system_listing_compatible_test' => array( 'profiles/testing/modules', - 'modules/simpletest/tests', + 'core/modules/simpletest/tests', ), ); diff --git a/core/modules/simpletest/tests/common_test.module b/core/modules/simpletest/tests/common_test.module index 9b61788..20a222b 100644 --- a/core/modules/simpletest/tests/common_test.module +++ b/core/modules/simpletest/tests/common_test.module @@ -206,10 +206,10 @@ function common_test_library() { 'website' => 'http://code.google.com/p/farbtastic/', 'version' => '5.3', 'js' => array( - 'misc/farbtastic/farbtastic.js' => array(), + 'core/misc/farbtastic/farbtastic.js' => array(), ), 'css' => array( - 'misc/farbtastic/farbtastic.css' => array(), + 'core/misc/farbtastic/farbtastic.css' => array(), ), ); return $libraries; diff --git a/core/modules/simpletest/tests/error.test b/core/modules/simpletest/tests/error.test index b1ec4b3..8c5a848 100644 --- a/core/modules/simpletest/tests/error.test +++ b/core/modules/simpletest/tests/error.test @@ -24,19 +24,19 @@ class DrupalErrorHandlerUnitTest extends DrupalWebTestCase { '%type' => 'Notice', '!message' => 'Undefined variable: bananas', '%function' => 'error_test_generate_warnings()', - '%file' => drupal_realpath('modules/simpletest/tests/error_test.module'), + '%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module'), ); $error_warning = array( '%type' => 'Warning', '!message' => 'Division by zero', '%function' => 'error_test_generate_warnings()', - '%file' => drupal_realpath('modules/simpletest/tests/error_test.module'), + '%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module'), ); $error_user_notice = array( '%type' => 'User warning', '!message' => 'Drupal is awesome', '%function' => 'error_test_generate_warnings()', - '%file' => drupal_realpath('modules/simpletest/tests/error_test.module'), + '%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module'), ); // Set error reporting to collect notices. @@ -73,14 +73,14 @@ class DrupalErrorHandlerUnitTest extends DrupalWebTestCase { '!message' => 'Drupal is awesome', '%function' => 'error_test_trigger_exception()', '%line' => 57, - '%file' => drupal_realpath('modules/simpletest/tests/error_test.module'), + '%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module'), ); $error_pdo_exception = array( '%type' => 'PDOException', '!message' => 'SELECT * FROM bananas_are_awesome', '%function' => 'error_test_trigger_pdo_exception()', '%line' => 65, - '%file' => drupal_realpath('modules/simpletest/tests/error_test.module'), + '%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module'), ); $this->drupalGet('error-test/trigger-exception'); diff --git a/core/modules/simpletest/tests/file.test b/core/modules/simpletest/tests/file.test index dc12b1b..cff05bb 100644 --- a/core/modules/simpletest/tests/file.test +++ b/core/modules/simpletest/tests/file.test @@ -368,11 +368,11 @@ class FileValidatorTest extends DrupalWebTestCase { parent::setUp(); $this->image = new stdClass(); - $this->image->uri = 'misc/druplicon.png'; + $this->image->uri = 'core/misc/druplicon.png'; $this->image->filename = basename($this->image->uri); $this->non_image = new stdClass(); - $this->non_image->uri = 'misc/jquery.js'; + $this->non_image->uri = 'core/misc/jquery.js'; $this->non_image->filename = basename($this->non_image->uri); } @@ -427,7 +427,7 @@ class FileValidatorTest extends DrupalWebTestCase { // Maximum size. if (image_get_toolkit()) { // Copy the image so that the original doesn't get resized. - copy(drupal_realpath('misc/druplicon.png'), 'temporary://druplicon.png'); + copy(drupal_realpath('core/misc/druplicon.png'), 'temporary://druplicon.png'); $this->image->uri = 'temporary://druplicon.png'; $errors = file_validate_image_resolution($this->image, '10x5'); @@ -955,7 +955,7 @@ class FileDirectoryTest extends FileTestCase { */ function testFileDestination() { // First test for non-existent file. - $destination = 'misc/xyz.txt'; + $destination = 'core/misc/xyz.txt'; $path = file_destination($destination, FILE_EXISTS_REPLACE); $this->assertEqual($path, $destination, t('Non-existing filepath destination is correct with FILE_EXISTS_REPLACE.'), 'File'); $path = file_destination($destination, FILE_EXISTS_RENAME); @@ -963,7 +963,7 @@ class FileDirectoryTest extends FileTestCase { $path = file_destination($destination, FILE_EXISTS_ERROR); $this->assertEqual($path, $destination, t('Non-existing filepath destination is correct with FILE_EXISTS_ERROR.'), 'File'); - $destination = 'misc/druplicon.png'; + $destination = 'core/misc/druplicon.png'; $path = file_destination($destination, FILE_EXISTS_REPLACE); $this->assertEqual($path, $destination, t('Existing filepath destination remains the same with FILE_EXISTS_REPLACE.'), 'File'); $path = file_destination($destination, FILE_EXISTS_RENAME); @@ -2215,7 +2215,7 @@ class FileDownloadTest extends FileTestCase { // Test generating an URL to a shipped file (i.e. a file that is part of // Drupal core, a module or a theme, for example a JavaScript file). - $filepath = 'misc/jquery.js'; + $filepath = 'core/misc/jquery.js'; $url = file_create_url($filepath); $this->assertEqual($GLOBALS['base_url'] . '/' . $filepath, $url, t('Correctly generated a URL for a shipped file.')); $this->drupalHead($url); @@ -2343,28 +2343,28 @@ class FileURLRewritingTest extends FileTestCase { // Test alteration of file URLs to use a CDN. variable_set('file_test_hook_file_url_alter', 'cdn'); - $filepath = 'misc/jquery.js'; + $filepath = 'core/misc/jquery.js'; $url = file_create_url($filepath); $this->assertEqual(FILE_URL_TEST_CDN_1 . '/' . $filepath, $url, t('Correctly generated a CDN URL for a shipped file.')); - $filepath = 'misc/favicon.ico'; + $filepath = 'core/misc/favicon.ico'; $url = file_create_url($filepath); $this->assertEqual(FILE_URL_TEST_CDN_2 . '/' . $filepath, $url, t('Correctly generated a CDN URL for a shipped file.')); // Test alteration of file URLs to use root-relative URLs. variable_set('file_test_hook_file_url_alter', 'root-relative'); - $filepath = 'misc/jquery.js'; + $filepath = 'core/misc/jquery.js'; $url = file_create_url($filepath); $this->assertEqual(base_path() . '/' . $filepath, $url, t('Correctly generated a root-relative URL for a shipped file.')); - $filepath = 'misc/favicon.ico'; + $filepath = 'core/misc/favicon.ico'; $url = file_create_url($filepath); $this->assertEqual(base_path() . '/' . $filepath, $url, t('Correctly generated a root-relative URL for a shipped file.')); // Test alteration of file URLs to use protocol-relative URLs. variable_set('file_test_hook_file_url_alter', 'protocol-relative'); - $filepath = 'misc/jquery.js'; + $filepath = 'core/misc/jquery.js'; $url = file_create_url($filepath); $this->assertEqual('/' . base_path() . '/' . $filepath, $url, t('Correctly generated a protocol-relative URL for a shipped file.')); - $filepath = 'misc/favicon.ico'; + $filepath = 'core/misc/favicon.ico'; $url = file_create_url($filepath); $this->assertEqual('/' . base_path() . '/' . $filepath, $url, t('Correctly generated a protocol-relative URL for a shipped file.')); } diff --git a/core/modules/simpletest/tests/form.test b/core/modules/simpletest/tests/form.test index e7ae9de..427010b 100644 --- a/core/modules/simpletest/tests/form.test +++ b/core/modules/simpletest/tests/form.test @@ -857,8 +857,8 @@ class FormsElementsVerticalTabsFunctionalTest extends DrupalWebTestCase { */ function testJavaScriptOrdering() { $this->drupalGet('form_test/vertical-tabs'); - $position1 = strpos($this->content, 'misc/vertical-tabs.js'); - $position2 = strpos($this->content, 'misc/collapse.js'); + $position1 = strpos($this->content, 'core/misc/vertical-tabs.js'); + $position2 = strpos($this->content, 'core/misc/collapse.js'); $this->assertTrue($position1 !== FALSE && $position2 !== FALSE && $position1 < $position2, t('vertical-tabs.js is included before collapse.js')); } } diff --git a/core/modules/simpletest/tests/form_test.module b/core/modules/simpletest/tests/form_test.module index 00be7d2..7440826 100644 --- a/core/modules/simpletest/tests/form_test.module +++ b/core/modules/simpletest/tests/form_test.module @@ -1491,7 +1491,7 @@ function form_test_clicked_button($form, &$form_state) { ); // Image buttons need a #src; the others need a #value. if ($type == 'image_button') { - $form[$name]['#src'] = 'misc/druplicon.png'; + $form[$name]['#src'] = 'core/misc/druplicon.png'; } else { $form[$name]['#value'] = $name; diff --git a/core/modules/simpletest/tests/graph.test b/core/modules/simpletest/tests/graph.test index c190161..e60cd39 100644 --- a/core/modules/simpletest/tests/graph.test +++ b/core/modules/simpletest/tests/graph.test @@ -18,7 +18,7 @@ class GraphUnitTest extends DrupalUnitTestCase { } function setUp() { - require_once DRUPAL_ROOT . '/includes/graph.inc'; + require_once DRUPAL_ROOT . '/core/includes/graph.inc'; parent::setUp(); } diff --git a/core/modules/simpletest/tests/http.php b/core/modules/simpletest/tests/http.php index a22938d..91985a6 100644 --- a/core/modules/simpletest/tests/http.php +++ b/core/modules/simpletest/tests/http.php @@ -12,14 +12,14 @@ $is_http_mock = !empty($_SERVER['HTTPS']); $_SERVER['HTTPS'] = NULL; ini_set('session.cookie_secure', FALSE); foreach ($_SERVER as $key => $value) { - $_SERVER[$key] = str_replace('modules/simpletest/tests/http.php', 'index.php', $value); + $_SERVER[$key] = str_replace('core/modules/simpletest/tests/http.php', 'index.php', $value); $_SERVER[$key] = str_replace('https://', 'http://', $_SERVER[$key]); } // Change current directory to the Drupal root. -chdir('../../..'); +chdir('../../../..'); define('DRUPAL_ROOT', getcwd()); -require_once DRUPAL_ROOT . '/includes/bootstrap.inc'; +require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; // Make sure this file can only be used by simpletest. drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION); diff --git a/core/modules/simpletest/tests/https.php b/core/modules/simpletest/tests/https.php index b5ffab6..c342abc 100644 --- a/core/modules/simpletest/tests/https.php +++ b/core/modules/simpletest/tests/https.php @@ -11,14 +11,14 @@ $is_https_mock = empty($_SERVER['HTTPS']); // Change to https. $_SERVER['HTTPS'] = 'on'; foreach ($_SERVER as $key => $value) { - $_SERVER[$key] = str_replace('modules/simpletest/tests/https.php', 'index.php', $value); + $_SERVER[$key] = str_replace('core/modules/simpletest/tests/https.php', 'index.php', $value); $_SERVER[$key] = str_replace('http://', 'https://', $_SERVER[$key]); } // Change current directory to the Drupal root. -chdir('../../..'); +chdir('../../../..'); define('DRUPAL_ROOT', getcwd()); -require_once DRUPAL_ROOT . '/includes/bootstrap.inc'; +require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; // Make sure this file can only be used by simpletest. drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION); diff --git a/core/modules/simpletest/tests/password.test b/core/modules/simpletest/tests/password.test index e100c2e..e0139e9 100644 --- a/core/modules/simpletest/tests/password.test +++ b/core/modules/simpletest/tests/password.test @@ -20,7 +20,7 @@ class PasswordHashingTest extends DrupalWebTestCase { } function setUp() { - require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'includes/password.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc'); parent::setUp(); } diff --git a/core/modules/simpletest/tests/system_test.module b/core/modules/simpletest/tests/system_test.module index 46fb876..f37a322 100644 --- a/core/modules/simpletest/tests/system_test.module +++ b/core/modules/simpletest/tests/system_test.module @@ -354,7 +354,7 @@ class SystemTestFileTransfer { * @see system_authorized_init(). */ function system_test_authorize_init_page($page_title) { - $authorize_url = $GLOBALS['base_url'] . '/authorize.php'; + $authorize_url = $GLOBALS['base_url'] . '/core/authorize.php'; system_authorized_init('system_test_authorize_run', drupal_get_path('module', 'system_test') . '/system_test.module', array(), $page_title); drupal_goto($authorize_url); } diff --git a/core/modules/simpletest/tests/theme.test b/core/modules/simpletest/tests/theme.test index d0ad77d..86395af 100644 --- a/core/modules/simpletest/tests/theme.test +++ b/core/modules/simpletest/tests/theme.test @@ -118,7 +118,7 @@ class ThemeTableUnitTest extends DrupalWebTestCase { $rows = array(array(1,2,3), array(4,5,6), array(7,8,9)); $this->content = theme('table', array('header' => $header, 'rows' => $rows)); $js = drupal_add_js(); - $this->assertTrue(isset($js['misc/tableheader.js']), t('tableheader.js was included when $sticky = TRUE.')); + $this->assertTrue(isset($js['core/misc/tableheader.js']), t('tableheader.js was included when $sticky = TRUE.')); $this->assertRaw('sticky-enabled', t('Table has a class of sticky-enabled when $sticky = TRUE.')); drupal_static_reset('drupal_add_js'); } @@ -134,7 +134,7 @@ class ThemeTableUnitTest extends DrupalWebTestCase { $colgroups = array(); $this->content = theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => $attributes, 'caption' => $caption, 'colgroups' => $colgroups, 'sticky' => FALSE)); $js = drupal_add_js(); - $this->assertFalse(isset($js['misc/tableheader.js']), t('tableheader.js was not included because $sticky = FALSE.')); + $this->assertFalse(isset($js['core/misc/tableheader.js']), t('tableheader.js was not included because $sticky = FALSE.')); $this->assertNoRaw('sticky-enabled', t('Table does not have a class of sticky-enabled because $sticky = FALSE.')); drupal_static_reset('drupal_add_js'); } diff --git a/core/modules/simpletest/tests/update.test b/core/modules/simpletest/tests/update.test index 2f55dc5..abbab47 100644 --- a/core/modules/simpletest/tests/update.test +++ b/core/modules/simpletest/tests/update.test @@ -19,7 +19,7 @@ class UpdateDependencyOrderingTestCase extends DrupalWebTestCase { function setUp() { parent::setUp('update_test_1', 'update_test_2', 'update_test_3'); - require_once DRUPAL_ROOT . '/includes/update.inc'; + require_once DRUPAL_ROOT . '/core/includes/update.inc'; } /** @@ -71,7 +71,7 @@ class UpdateDependencyMissingTestCase extends DrupalWebTestCase { // Only install update_test_2.module, even though its updates have a // dependency on update_test_3.module. parent::setUp('update_test_2'); - require_once DRUPAL_ROOT . '/includes/update.inc'; + require_once DRUPAL_ROOT . '/core/includes/update.inc'; } function testMissingUpdate() { @@ -99,7 +99,7 @@ class UpdateDependencyHookInvocationTestCase extends DrupalWebTestCase { function setUp() { parent::setUp('update_test_1', 'update_test_2'); - require_once DRUPAL_ROOT . '/includes/update.inc'; + require_once DRUPAL_ROOT . '/core/includes/update.inc'; } /** diff --git a/core/modules/simpletest/tests/upgrade/upgrade.test b/core/modules/simpletest/tests/upgrade/upgrade.test index 1ef8525..8515567 100644 --- a/core/modules/simpletest/tests/upgrade/upgrade.test +++ b/core/modules/simpletest/tests/upgrade/upgrade.test @@ -34,7 +34,7 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase { global $user, $language, $conf; // Load the Update API. - require_once DRUPAL_ROOT . '/includes/update.inc'; + require_once DRUPAL_ROOT . '/core/includes/update.inc'; // Reset flags. $this->upgradedSite = FALSE; @@ -231,7 +231,7 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase { * TRUE if the upgrade succeeded, FALSE otherwise. */ protected function performUpgrade($register_errors = TRUE) { - $update_url = $GLOBALS['base_url'] . '/update.php'; + $update_url = $GLOBALS['base_url'] . '/core/update.php'; // Load the first update screen. $this->drupalGet($update_url, array('external' => TRUE)); diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index 92c534e..ab30a46 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -782,7 +782,7 @@ function system_modules($form, $form_state = array()) { $help_arg = module_exists('help') ? drupal_help_arg() : FALSE; // Used when displaying modules that are required by the install profile. - require_once DRUPAL_ROOT . '/includes/install.inc'; + require_once DRUPAL_ROOT . '/core/includes/install.inc'; $distribution_name = check_plain(drupal_install_profile_distribution_name()); // Iterate through each of the modules. @@ -986,7 +986,7 @@ function _system_modules_build_row($info, $extra) { } else { $form['enable'] = array( - '#markup' => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => $status_short, 'title' => $status_short)), + '#markup' => theme('image', array('path' => 'core/misc/watchdog-error.png', 'alt' => $status_short, 'title' => $status_short)), ); $form['description']['#markup'] .= theme('system_modules_incompatible', array('message' => $status_long)); } @@ -1051,7 +1051,7 @@ function system_modules_confirm_form($modules, $storage) { * Submit callback; handles modules form submission. */ function system_modules_submit($form, &$form_state) { - include_once DRUPAL_ROOT . '/includes/install.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc'; // Builds list of modules. $modules = array(); @@ -1200,7 +1200,7 @@ function system_modules_submit($form, &$form_state) { */ function system_modules_uninstall($form, $form_state = NULL) { // Make sure the install API is available. - include_once DRUPAL_ROOT . '/includes/install.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc'; // Display the confirm form if any modules have been submitted. if (!empty($form_state['storage']) && $confirm_form = system_modules_uninstall_confirm_form($form_state['storage'])) { @@ -1313,7 +1313,7 @@ function system_modules_uninstall_validate($form, &$form_state) { */ function system_modules_uninstall_submit($form, &$form_state) { // Make sure the install API is available. - include_once DRUPAL_ROOT . '/includes/install.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc'; if (!empty($form['#confirmed'])) { // Call the uninstall routine for each selected module. @@ -1858,7 +1858,7 @@ function system_rss_feeds_settings() { * @see system_regional_settings_submit() */ function system_regional_settings() { - include_once DRUPAL_ROOT . '/includes/locale.inc'; + include_once DRUPAL_ROOT . '/core/includes/locale.inc'; $countries = country_get_list(); // Date settings: @@ -2224,7 +2224,7 @@ function system_clean_url_settings($form, &$form_state) { */ function system_status($check = FALSE) { // Load .install files - include_once DRUPAL_ROOT . '/includes/install.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc'; drupal_load_updates(); // Check run-time requirements and status information. @@ -2272,7 +2272,7 @@ function system_php() { * Default page callback for batches. */ function system_batch_page() { - require_once DRUPAL_ROOT . '/includes/batch.inc'; + require_once DRUPAL_ROOT . '/core/includes/batch.inc'; $output = _batch_page(); if ($output === FALSE) { diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php index d5805b9..f159fdb 100644 --- a/core/modules/system/system.api.php +++ b/core/modules/system/system.api.php @@ -700,7 +700,7 @@ function hook_exit($destination = NULL) { */ function hook_js_alter(&$javascript) { // Swap out jQuery to use an updated version of the library. - $javascript['misc/jquery.js']['data'] = drupal_get_path('module', 'jquery_update') . '/jquery.js'; + $javascript['core/misc/jquery.js']['data'] = drupal_get_path('module', 'jquery_update') . '/jquery.js'; } /** @@ -2066,10 +2066,10 @@ function hook_theme($existing, $type, $theme, $path) { * 'variables' => array( * 'account' => NULL, * ), - * 'template' => 'modules/user/user-profile', - * 'file' => 'modules/user/user.pages.inc', + * 'template' => 'core/modules/user/user-profile', + * 'file' => 'core/modules/user/user.pages.inc', * 'type' => 'module', - * 'theme path' => 'modules/user', + * 'theme path' => 'core/modules/user', * 'preprocess functions' => array( * 0 => 'template_preprocess', * 1 => 'template_preprocess_user_profile', diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 6d2fc80..6f95a6e 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -290,7 +290,7 @@ function system_requirements($phase) { } $description .= ' ' . $t('You can run cron manually.', array('@cron' => url('admin/reports/status/run-cron'))); - $description .= '
' . $t('To run cron from outside the site, go to !cron', array('!cron' => url($base_url . '/cron.php', array('external' => TRUE, 'query' => array('cron_key' => variable_get('cron_key', 'drupal')))))); + $description .= '
' . $t('To run cron from outside the site, go to !cron', array('!cron' => url($base_url . '/core/cron.php', array('external' => TRUE, 'query' => array('cron_key' => variable_get('cron_key', 'drupal')))))); $requirements['cron'] = array( 'title' => $t('Cron maintenance tasks'), @@ -383,7 +383,7 @@ function system_requirements($phase) { if (max($updates) > $default) { $requirements['update']['severity'] = REQUIREMENT_ERROR; $requirements['update']['value'] = $t('Out of date'); - $requirements['update']['description'] = $t('Some modules have database schema updates to install. You should run the database update script immediately.', array('@update' => base_path() . 'update.php')); + $requirements['update']['description'] = $t('Some modules have database schema updates to install. You should run the database update script immediately.', array('@update' => base_path() . 'core/update.php')); break; } } @@ -456,7 +456,7 @@ function system_requirements($phase) { } // Test Unicode library - include_once DRUPAL_ROOT . '/includes/unicode.inc'; + include_once DRUPAL_ROOT . '/core/includes/unicode.inc'; $requirements = array_merge($requirements, unicode_requirements()); if ($phase == 'runtime') { diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 21b23f4..c0ed2e1 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -101,14 +101,14 @@ function system_help($path, $arg) { $output = '

' . t('Download additional contributed modules to extend Drupal\'s functionality.', array('@modules' => 'http://drupal.org/project/modules')) . '

'; if (module_exists('update')) { if (update_manager_access()) { - $output .= '

' . t('Regularly review and install available updates to maintain a secure and current site. Always run the update script each time a module is updated.', array('@update-php' => $base_url . '/update.php', '@updates' => url('admin/reports/updates'))) . '

'; + $output .= '

' . t('Regularly review and install available updates to maintain a secure and current site. Always run the update script each time a module is updated.', array('@update-php' => $base_url . '/core/update.php', '@updates' => url('admin/reports/updates'))) . '

'; } else { - $output .= '

' . t('Regularly review available updates to maintain a secure and current site. Always run the update script each time a module is updated.', array('@update-php' => $base_url . '/update.php', '@updates' => url('admin/reports/updates'))) . '

'; + $output .= '

' . t('Regularly review available updates to maintain a secure and current site. Always run the update script each time a module is updated.', array('@update-php' => $base_url . '/core/update.php', '@updates' => url('admin/reports/updates'))) . '

'; } } else { - $output .= '

' . t('Regularly review available updates to maintain a secure and current site. Always run the update script each time a module is updated. Enable the Update manager module to update and install modules and themes.', array('@update-php' => $base_url . '/update.php')) . '

'; + $output .= '

' . t('Regularly review available updates to maintain a secure and current site. Always run the update script each time a module is updated. Enable the Update manager module to update and install modules and themes.', array('@update-php' => $base_url . '/core/update.php')) . '

'; } return $output; case 'admin/modules/uninstall': @@ -121,7 +121,7 @@ function system_help($path, $arg) { case 'admin/config/development/maintenance': global $user; if ($user->uid == 1) { - return '

' . t('If you are upgrading to a newer version of Drupal or upgrading contributed modules or themes, you may need to run the update script.', array('@update-php' => $base_url . '/update.php')) . '

'; + return '

' . t('If you are upgrading to a newer version of Drupal or upgrading contributed modules or themes, you may need to run the update script.', array('@update-php' => $base_url . '/core/update.php')) . '

'; } break; case 'admin/config/system/actions': @@ -531,7 +531,7 @@ function system_menu() { 'access callback' => TRUE, 'theme callback' => 'ajax_base_page_theme', 'type' => MENU_CALLBACK, - 'file path' => 'includes', + 'file path' => 'core/includes', 'file' => 'form.inc', ); $items['system/timezone'] = array( @@ -1065,7 +1065,7 @@ function _system_batch_theme() { // Retrieve the current state of the batch. $batch = &batch_get(); if (!$batch && isset($_REQUEST['id'])) { - require_once DRUPAL_ROOT . '/includes/batch.inc'; + require_once DRUPAL_ROOT . '/core/includes/batch.inc'; $batch = batch_load($_REQUEST['id']); } // Use the same theme as the page that started the batch. @@ -1084,7 +1084,7 @@ function system_library() { 'website' => 'http://api.drupal.org/api/drupal/includes--ajax.inc/group/ajax/7', 'version' => VERSION, 'js' => array( - 'misc/ajax.js' => array('group' => JS_LIBRARY, 'weight' => 2), + 'core/misc/ajax.js' => array('group' => JS_LIBRARY, 'weight' => 2), ), 'dependencies' => array( array('system', 'drupal.progress'), @@ -1096,7 +1096,7 @@ function system_library() { 'title' => 'Drupal batch API', 'version' => VERSION, 'js' => array( - 'misc/batch.js' => array('group' => JS_DEFAULT, 'cache' => FALSE), + 'core/misc/batch.js' => array('group' => JS_DEFAULT, 'cache' => FALSE), ), 'dependencies' => array( array('system', 'drupal.progress'), @@ -1108,7 +1108,7 @@ function system_library() { 'title' => 'Drupal progress indicator', 'version' => VERSION, 'js' => array( - 'misc/progress.js' => array('group' => JS_DEFAULT, 'cache' => FALSE), + 'core/misc/progress.js' => array('group' => JS_DEFAULT, 'cache' => FALSE), ), ); @@ -1117,7 +1117,7 @@ function system_library() { 'title' => 'Drupal form library', 'version' => VERSION, 'js' => array( - 'misc/form.js' => array('group' => JS_LIBRARY, 'weight' => 1), + 'core/misc/form.js' => array('group' => JS_LIBRARY, 'weight' => 1), ), ); @@ -1126,7 +1126,7 @@ function system_library() { 'title' => 'Drupal states', 'version' => VERSION, 'js' => array( - 'misc/states.js' => array('group' => JS_LIBRARY, 'weight' => 1), + 'core/misc/states.js' => array('group' => JS_LIBRARY, 'weight' => 1), ), ); @@ -1135,7 +1135,7 @@ function system_library() { 'title' => 'Drupal collapsible fieldset', 'version' => VERSION, 'js' => array( - 'misc/collapse.js' => array('group' => JS_DEFAULT), + 'core/misc/collapse.js' => array('group' => JS_DEFAULT), ), 'dependencies' => array( // collapse.js relies on drupalGetSummary in form.js @@ -1148,7 +1148,7 @@ function system_library() { 'title' => 'Drupal resizable textarea', 'version' => VERSION, 'js' => array( - 'misc/textarea.js' => array('group' => JS_DEFAULT), + 'core/misc/textarea.js' => array('group' => JS_DEFAULT), ), ); @@ -1157,7 +1157,7 @@ function system_library() { 'title' => 'Drupal autocomplete', 'version' => VERSION, 'js' => array( - 'misc/autocomplete.js' => array('group' => JS_DEFAULT), + 'core/misc/autocomplete.js' => array('group' => JS_DEFAULT), ), ); @@ -1167,7 +1167,7 @@ function system_library() { 'website' => 'http://jquery.com', 'version' => '1.4.4', 'js' => array( - 'misc/jquery.js' => array('group' => JS_LIBRARY, 'weight' => -20), + 'core/misc/jquery.js' => array('group' => JS_LIBRARY, 'weight' => -20), ), ); @@ -1177,7 +1177,7 @@ function system_library() { 'website' => 'http://plugins.jquery.com/project/once', 'version' => '1.2', 'js' => array( - 'misc/jquery.once.js' => array('group' => JS_LIBRARY, 'weight' => -19), + 'core/misc/jquery.once.js' => array('group' => JS_LIBRARY, 'weight' => -19), ), ); @@ -1187,7 +1187,7 @@ function system_library() { 'website' => 'http://malsup.com/jquery/form/', 'version' => '2.52', 'js' => array( - 'misc/jquery.form.js' => array(), + 'core/misc/jquery.form.js' => array(), ), 'dependencies' => array( array('system', 'jquery.cookie'), @@ -1200,7 +1200,7 @@ function system_library() { 'website' => 'http://benalman.com/projects/jquery-bbq-plugin/', 'version' => '1.2.1', 'js' => array( - 'misc/jquery.ba-bbq.js' => array(), + 'core/misc/jquery.ba-bbq.js' => array(), ), ); @@ -1210,10 +1210,10 @@ function system_library() { 'website' => 'http://drupal.org/node/323112', 'version' => '1.0', 'js' => array( - 'misc/vertical-tabs.js' => array(), + 'core/misc/vertical-tabs.js' => array(), ), 'css' => array( - 'misc/vertical-tabs.css' => array(), + 'core/misc/vertical-tabs.css' => array(), ), 'dependencies' => array( // Vertical tabs relies on drupalGetSummary in form.js @@ -1227,10 +1227,10 @@ function system_library() { 'website' => 'http://code.google.com/p/farbtastic/', 'version' => '1.2', 'js' => array( - 'misc/farbtastic/farbtastic.js' => array(), + 'core/misc/farbtastic/farbtastic.js' => array(), ), 'css' => array( - 'misc/farbtastic/farbtastic.css' => array(), + 'core/misc/farbtastic/farbtastic.css' => array(), ), ); @@ -1240,7 +1240,7 @@ function system_library() { 'website' => 'http://plugins.jquery.com/project/cookie', 'version' => '1.0', 'js' => array( - 'misc/jquery.cookie.js' => array(), + 'core/misc/jquery.cookie.js' => array(), ), ); @@ -1250,11 +1250,11 @@ function system_library() { 'website' => 'http://jqueryui.com', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.ui.core.min.js' => array('group' => JS_LIBRARY, 'weight' => -11), + 'core/misc/ui/jquery.ui.core.min.js' => array('group' => JS_LIBRARY, 'weight' => -11), ), 'css' => array( - 'misc/ui/jquery.ui.core.css' => array(), - 'misc/ui/jquery.ui.theme.css' => array(), + 'core/misc/ui/jquery.ui.core.css' => array(), + 'core/misc/ui/jquery.ui.theme.css' => array(), ), ); $libraries['ui.accordion'] = array( @@ -1262,10 +1262,10 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/accordion/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.ui.accordion.min.js' => array(), + 'core/misc/ui/jquery.ui.accordion.min.js' => array(), ), 'css' => array( - 'misc/ui/jquery.ui.accordion.css' => array(), + 'core/misc/ui/jquery.ui.accordion.css' => array(), ), 'dependencies' => array( array('system', 'ui.widget'), @@ -1276,10 +1276,10 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/autocomplete/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.ui.autocomplete.min.js' => array(), + 'core/misc/ui/jquery.ui.autocomplete.min.js' => array(), ), 'css' => array( - 'misc/ui/jquery.ui.autocomplete.css' => array(), + 'core/misc/ui/jquery.ui.autocomplete.css' => array(), ), 'dependencies' => array( array('system', 'ui.widget'), @@ -1291,10 +1291,10 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/button/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.ui.button.min.js' => array(), + 'core/misc/ui/jquery.ui.button.min.js' => array(), ), 'css' => array( - 'misc/ui/jquery.ui.button.css' => array(), + 'core/misc/ui/jquery.ui.button.css' => array(), ), 'dependencies' => array( array('system', 'ui.widget'), @@ -1305,10 +1305,10 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/datepicker/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.ui.datepicker.min.js' => array(), + 'core/misc/ui/jquery.ui.datepicker.min.js' => array(), ), 'css' => array( - 'misc/ui/jquery.ui.datepicker.css' => array(), + 'core/misc/ui/jquery.ui.datepicker.css' => array(), ), 'dependencies' => array( array('system', 'ui'), @@ -1319,10 +1319,10 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/dialog/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.ui.dialog.min.js' => array(), + 'core/misc/ui/jquery.ui.dialog.min.js' => array(), ), 'css' => array( - 'misc/ui/jquery.ui.dialog.css' => array(), + 'core/misc/ui/jquery.ui.dialog.css' => array(), ), 'dependencies' => array( array('system', 'ui.widget'), @@ -1338,7 +1338,7 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/draggable/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.ui.draggable.min.js' => array(), + 'core/misc/ui/jquery.ui.draggable.min.js' => array(), ), 'dependencies' => array( array('system', 'ui.widget'), @@ -1350,7 +1350,7 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/droppable/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.ui.droppable.min.js' => array(), + 'core/misc/ui/jquery.ui.droppable.min.js' => array(), ), 'dependencies' => array( array('system', 'ui.widget'), @@ -1363,7 +1363,7 @@ function system_library() { 'website' => 'http://docs.jquery.com/UI/Mouse', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.ui.mouse.min.js' => array(), + 'core/misc/ui/jquery.ui.mouse.min.js' => array(), ), 'dependencies' => array( array('system', 'ui.widget'), @@ -1374,7 +1374,7 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/position/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.ui.position.min.js' => array(), + 'core/misc/ui/jquery.ui.position.min.js' => array(), ), ); $libraries['ui.progressbar'] = array( @@ -1382,10 +1382,10 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/progressbar/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.ui.progressbar.min.js' => array(), + 'core/misc/ui/jquery.ui.progressbar.min.js' => array(), ), 'css' => array( - 'misc/ui/jquery.ui.progressbar.css' => array(), + 'core/misc/ui/jquery.ui.progressbar.css' => array(), ), 'dependencies' => array( array('system', 'ui.widget'), @@ -1396,10 +1396,10 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/resizable/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.ui.resizable.min.js' => array(), + 'core/misc/ui/jquery.ui.resizable.min.js' => array(), ), 'css' => array( - 'misc/ui/jquery.ui.resizable.css' => array(), + 'core/misc/ui/jquery.ui.resizable.css' => array(), ), 'dependencies' => array( array('system', 'ui.widget'), @@ -1411,10 +1411,10 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/selectable/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.ui.selectable.min.js' => array(), + 'core/misc/ui/jquery.ui.selectable.min.js' => array(), ), 'css' => array( - 'misc/ui/jquery.ui.selectable.css' => array(), + 'core/misc/ui/jquery.ui.selectable.css' => array(), ), 'dependencies' => array( array('system', 'ui.widget'), @@ -1426,10 +1426,10 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/slider/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.ui.slider.min.js' => array(), + 'core/misc/ui/jquery.ui.slider.min.js' => array(), ), 'css' => array( - 'misc/ui/jquery.ui.slider.css' => array(), + 'core/misc/ui/jquery.ui.slider.css' => array(), ), 'dependencies' => array( array('system', 'ui.widget'), @@ -1441,7 +1441,7 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/sortable/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.ui.sortable.min.js' => array(), + 'core/misc/ui/jquery.ui.sortable.min.js' => array(), ), 'dependencies' => array( array('system', 'ui.widget'), @@ -1453,10 +1453,10 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/tabs/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.ui.tabs.min.js' => array(), + 'core/misc/ui/jquery.ui.tabs.min.js' => array(), ), 'css' => array( - 'misc/ui/jquery.ui.tabs.css' => array(), + 'core/misc/ui/jquery.ui.tabs.css' => array(), ), 'dependencies' => array( array('system', 'ui.widget'), @@ -1467,7 +1467,7 @@ function system_library() { 'website' => 'http://docs.jquery.com/UI/Widget', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.ui.widget.min.js' => array('group' => JS_LIBRARY, 'weight' => -10), + 'core/misc/ui/jquery.ui.widget.min.js' => array('group' => JS_LIBRARY, 'weight' => -10), ), 'dependencies' => array( array('system', 'ui'), @@ -1478,7 +1478,7 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.effects.core.min.js' => array('group' => JS_LIBRARY, 'weight' => -9), + 'core/misc/ui/jquery.effects.core.min.js' => array('group' => JS_LIBRARY, 'weight' => -9), ), ); $libraries['effects.blind'] = array( @@ -1486,7 +1486,7 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.effects.blind.min.js' => array(), + 'core/misc/ui/jquery.effects.blind.min.js' => array(), ), 'dependencies' => array( array('system', 'effects'), @@ -1497,7 +1497,7 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.effects.bounce.min.js' => array(), + 'core/misc/ui/jquery.effects.bounce.min.js' => array(), ), 'dependencies' => array( array('system', 'effects'), @@ -1508,7 +1508,7 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.effects.clip.min.js' => array(), + 'core/misc/ui/jquery.effects.clip.min.js' => array(), ), 'dependencies' => array( array('system', 'effects'), @@ -1519,7 +1519,7 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.effects.drop.min.js' => array(), + 'core/misc/ui/jquery.effects.drop.min.js' => array(), ), 'dependencies' => array( array('system', 'effects'), @@ -1530,7 +1530,7 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.effects.explode.min.js' => array(), + 'core/misc/ui/jquery.effects.explode.min.js' => array(), ), 'dependencies' => array( array('system', 'effects'), @@ -1541,7 +1541,7 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.effects.fade.min.js' => array(), + 'core/misc/ui/jquery.effects.fade.min.js' => array(), ), 'dependencies' => array( array('system', 'effects'), @@ -1552,7 +1552,7 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.effects.fold.min.js' => array(), + 'core/misc/ui/jquery.effects.fold.min.js' => array(), ), 'dependencies' => array( array('system', 'effects'), @@ -1563,7 +1563,7 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.effects.highlight.min.js' => array(), + 'core/misc/ui/jquery.effects.highlight.min.js' => array(), ), 'dependencies' => array( array('system', 'effects'), @@ -1574,7 +1574,7 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.effects.pulsate.min.js' => array(), + 'core/misc/ui/jquery.effects.pulsate.min.js' => array(), ), 'dependencies' => array( array('system', 'effects'), @@ -1585,7 +1585,7 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.effects.scale.min.js' => array(), + 'core/misc/ui/jquery.effects.scale.min.js' => array(), ), 'dependencies' => array( array('system', 'effects'), @@ -1596,7 +1596,7 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.effects.shake.min.js' => array(), + 'core/misc/ui/jquery.effects.shake.min.js' => array(), ), 'dependencies' => array( array('system', 'effects'), @@ -1607,7 +1607,7 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.effects.slide.min.js' => array(), + 'core/misc/ui/jquery.effects.slide.min.js' => array(), ), 'dependencies' => array( array('system', 'effects'), @@ -1618,7 +1618,7 @@ function system_library() { 'website' => 'http://jqueryui.com/demos/effect/', 'version' => '1.8.7', 'js' => array( - 'misc/ui/jquery.effects.transfer.min.js' => array(), + 'core/misc/ui/jquery.effects.transfer.min.js' => array(), ), 'dependencies' => array( array('system', 'effects'), @@ -1786,7 +1786,7 @@ function system_authorized_get_url(array $options = array()) { $options['https'] = TRUE; // We prefix with $base_url so we get a full path even if clean URLs are // disabled. - return url($base_url . '/authorize.php', $options); + return url($base_url . '/core/authorize.php', $options); } /** @@ -1844,7 +1844,7 @@ function system_filetransfer_info() { 'title' => t('FTP'), 'class' => 'FileTransferFTP', 'file' => 'ftp.inc', - 'file path' => 'includes/filetransfer', + 'file path' => 'core/includes/filetransfer', 'weight' => 0, ); } @@ -1856,7 +1856,7 @@ function system_filetransfer_info() { 'title' => t('SSH'), 'class' => 'FileTransferSSH', 'file' => 'ssh.inc', - 'file path' => 'includes/filetransfer', + 'file path' => 'core/includes/filetransfer', 'weight' => 20, ); } @@ -1997,7 +1997,7 @@ function system_user_timezone(&$form, &$form_state) { if (!isset($account->timezone) && $account->uid == $user->uid && empty($form_state['input']['timezone'])) { $form['timezone']['#description'] = t('Your time zone setting will be automatically detected if possible. Confirm the selection and click save.'); $form['timezone']['timezone']['#attributes'] = array('class' => array('timezone-detect')); - drupal_add_js('misc/timezone.js'); + drupal_add_js('core/misc/timezone.js'); } } @@ -3511,7 +3511,7 @@ function system_date_format_types() { * Implements hook_date_formats(). */ function system_date_formats() { - include_once DRUPAL_ROOT . '/includes/date.inc'; + include_once DRUPAL_ROOT . '/core/includes/date.inc'; return system_default_date_formats(); } diff --git a/core/modules/system/system.test b/core/modules/system/system.test index 125cb8f..85c6b38 100644 --- a/core/modules/system/system.test +++ b/core/modules/system/system.test @@ -583,17 +583,17 @@ class CronRunTestCase extends DrupalWebTestCase { global $base_url; // Run cron anonymously without any cron key. - $this->drupalGet($base_url . '/cron.php', array('external' => TRUE)); + $this->drupalGet($base_url . '/core/cron.php', array('external' => TRUE)); $this->assertResponse(403); // Run cron anonymously with a random cron key. $key = $this->randomName(16); - $this->drupalGet($base_url . '/cron.php', array('external' => TRUE, 'query' => array('cron_key' => $key))); + $this->drupalGet($base_url . '/core/cron.php', array('external' => TRUE, 'query' => array('cron_key' => $key))); $this->assertResponse(403); // Run cron anonymously with the valid cron key. $key = variable_get('cron_key', 'drupal'); - $this->drupalGet($base_url . '/cron.php', array('external' => TRUE, 'query' => array('cron_key' => $key))); + $this->drupalGet($base_url . '/core/cron.php', array('external' => TRUE, 'query' => array('cron_key' => $key))); $this->assertResponse(200); } @@ -1406,16 +1406,16 @@ class SystemThemeFunctionalTest extends DrupalWebTestCase { $this->drupalPost('admin/appearance', $edit, t('Save configuration')); $this->drupalGet('admin/config'); - $this->assertRaw('themes/seven', t('Administration theme used on an administration page.')); + $this->assertRaw('core/themes/seven', t('Administration theme used on an administration page.')); $this->drupalGet('node/' . $this->node->nid); - $this->assertRaw('themes/stark', t('Site default theme used on node page.')); + $this->assertRaw('core/themes/stark', t('Site default theme used on node page.')); $this->drupalGet('node/add'); - $this->assertRaw('themes/seven', t('Administration theme used on the add content page.')); + $this->assertRaw('core/themes/seven', t('Administration theme used on the add content page.')); $this->drupalGet('node/' . $this->node->nid . '/edit'); - $this->assertRaw('themes/seven', t('Administration theme used on the edit content page.')); + $this->assertRaw('core/themes/seven', t('Administration theme used on the edit content page.')); // Disable the admin theme on the node admin pages. $edit = array( @@ -1424,10 +1424,10 @@ class SystemThemeFunctionalTest extends DrupalWebTestCase { $this->drupalPost('admin/appearance', $edit, t('Save configuration')); $this->drupalGet('admin/config'); - $this->assertRaw('themes/seven', t('Administration theme used on an administration page.')); + $this->assertRaw('core/themes/seven', t('Administration theme used on an administration page.')); $this->drupalGet('node/add'); - $this->assertRaw('themes/stark', t('Site default theme used on the add content page.')); + $this->assertRaw('core/themes/stark', t('Site default theme used on the add content page.')); // Reset to the default theme settings. variable_set('theme_default', 'bartik'); @@ -1438,10 +1438,10 @@ class SystemThemeFunctionalTest extends DrupalWebTestCase { $this->drupalPost('admin/appearance', $edit, t('Save configuration')); $this->drupalGet('admin'); - $this->assertRaw('themes/bartik', t('Site default theme used on administration page.')); + $this->assertRaw('core/themes/bartik', t('Site default theme used on administration page.')); $this->drupalGet('node/add'); - $this->assertRaw('themes/bartik', t('Site default theme used on the add content page.')); + $this->assertRaw('core/themes/bartik', t('Site default theme used on the add content page.')); } } @@ -1849,7 +1849,7 @@ class UpdateScriptFunctionalTest extends DrupalWebTestCase { function setUp() { parent::setUp(); - $this->update_url = $GLOBALS['base_url'] . '/update.php'; + $this->update_url = $GLOBALS['base_url'] . '/core/update.php'; $this->update_user = $this->drupalCreateUser(array('administer software updates')); } @@ -1876,7 +1876,7 @@ class UpdateScriptFunctionalTest extends DrupalWebTestCase { // Access the update page as user 1. $user1 = user_load(1); $user1->pass_raw = user_password(); - require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'includes/password.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc'); $user1->pass = user_hash_password(trim($user1->pass_raw)); db_query("UPDATE {users} SET pass = :pass WHERE uid = :uid", array(':pass' => $user1->pass, ':uid' => $user1->uid)); $this->drupalLogin($user1); diff --git a/core/modules/system/system.updater.inc b/core/modules/system/system.updater.inc index 0df1ad9..84c1752 100644 --- a/core/modules/system/system.updater.inc +++ b/core/modules/system/system.updater.inc @@ -52,8 +52,8 @@ class ModuleUpdater extends Updater implements DrupalUpdaterInterface { * Return available database schema updates one a new version is installed. */ public function getSchemaUpdates() { - require_once DRUPAL_ROOT . '/includes/install.inc'; - require_once DRUPAL_ROOT . '/includes/update.inc'; + require_once DRUPAL_ROOT . '/core/includes/install.inc'; + require_once DRUPAL_ROOT . '/core/includes/update.inc'; if (_update_get_project_type($project) != 'module') { return array(); diff --git a/core/modules/translation/translation.pages.inc b/core/modules/translation/translation.pages.inc index 102d1b8..ae54a43 100644 --- a/core/modules/translation/translation.pages.inc +++ b/core/modules/translation/translation.pages.inc @@ -12,7 +12,7 @@ * Node object. */ function translation_node_overview($node) { - include_once DRUPAL_ROOT . '/includes/language.inc'; + include_once DRUPAL_ROOT . '/core/includes/language.inc'; if ($node->tnid) { // Already part of a set, grab that set. diff --git a/core/modules/update/update.authorize.inc b/core/modules/update/update.authorize.inc index f4be44e..44fce05 100644 --- a/core/modules/update/update.authorize.inc +++ b/core/modules/update/update.authorize.inc @@ -211,7 +211,7 @@ function update_authorize_update_batch_finished($success, $results) { // Since we're doing an update of existing code, always add a task for // running update.php. $results['tasks'][] = t('Your modules have been downloaded and updated.'); - $results['tasks'][] = t('Run database updates', array('@update' => base_path() . 'update.php')); + $results['tasks'][] = t('Run database updates', array('@update' => base_path() . 'core/update.php')); // Unset the variable since it is no longer needed. unset($_SESSION['maintenance_mode']); diff --git a/core/modules/update/update.module b/core/modules/update/update.module index 1008964..e7a05c0 100644 --- a/core/modules/update/update.module +++ b/core/modules/update/update.module @@ -661,10 +661,10 @@ function update_verify_update_archive($project, $archive_file, $directory) { // Make sure this isn't a tarball of Drupal core. if ( file_exists("$directory/$project/index.php") - && file_exists("$directory/$project/update.php") - && file_exists("$directory/$project/includes/bootstrap.inc") - && file_exists("$directory/$project/modules/node/node.module") - && file_exists("$directory/$project/modules/system/system.module") + && file_exists("$directory/$project/core/update.php") + && file_exists("$directory/$project/core/includes/bootstrap.inc") + && file_exists("$directory/$project/core/modules/node/node.module") + && file_exists("$directory/$project/core/modules/system/system.module") ) { return array( 'no-core' => t('Automatic updating of Drupal core is not supported. See the upgrade guide for information on how to update Drupal core manually.', array('@upgrade-guide' => 'http://drupal.org/upgrade')), diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 92a55bc..3dcd0f7 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -406,7 +406,7 @@ function user_save($account, $edit = array(), $category = 'account') { try { if (!empty($edit['pass'])) { // Allow alternate password hashing schemes. - require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'includes/password.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc'); $edit['pass'] = user_hash_password(trim($edit['pass'])); // Abort if the hashing failed and returned FALSE. if (!$edit['pass']) { @@ -1172,7 +1172,7 @@ function user_validate_current_pass(&$form, &$form_state) { // form values like password_confirm that have their own validation // that prevent them from being empty if they are changed. if ((strlen(trim($form_state['values'][$key])) > 0) && ($form_state['values'][$key] != $account->$key)) { - require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'includes/password.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc'); $current_pass_failed = empty($form_state['values']['current_pass']) || !user_check_password($form_state['values']['current_pass'], $account); if ($current_pass_failed) { form_set_error('current_pass', t("Your current password is missing or incorrect; it's required to change the %name.", array('%name' => $name))); @@ -2178,7 +2178,7 @@ function user_authenticate($name, $password) { $account = user_load_by_name($name); if ($account) { // Allow alternate password hashing schemes. - require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'includes/password.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc'); if (user_check_password($password, $account)) { // Successful authentication. $uid = $account->uid; diff --git a/core/modules/user/user.test b/core/modules/user/user.test index 6ecbfac..54a1d1e 100644 --- a/core/modules/user/user.test +++ b/core/modules/user/user.test @@ -400,7 +400,7 @@ class UserLoginTestCase extends DrupalWebTestCase { */ function testPasswordRehashOnLogin() { // Load password hashing API. - require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'includes/password.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc'); // Set initial $count_log2 to the default, DRUPAL_HASH_COUNT. variable_set('password_count_log2', DRUPAL_HASH_COUNT); // Create a new user and authenticate. @@ -507,7 +507,7 @@ class UserCancelTestCase extends DrupalWebTestCase { function testUserCancelUid1() { // Update uid 1's name and password to we know it. $password = user_password(); - require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'includes/password.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc'); $account = array( 'name' => 'user1', 'pass' => user_hash_password(trim($password)), diff --git a/core/scripts/cron-curl.sh b/core/scripts/cron-curl.sh index 9b168ab..71f06b9 100644 --- a/core/scripts/cron-curl.sh +++ b/core/scripts/cron-curl.sh @@ -1,3 +1,3 @@ #!/bin/sh -curl --silent --compressed http://example.com/cron.php +curl --silent --compressed http://example.com/core/cron.php diff --git a/core/scripts/cron-lynx.sh b/core/scripts/cron-lynx.sh index 904667a..36880d2 100644 --- a/core/scripts/cron-lynx.sh +++ b/core/scripts/cron-lynx.sh @@ -1,3 +1,3 @@ #!/bin/sh -/usr/bin/lynx -source http://example.com/cron.php > /dev/null 2>&1 +/usr/bin/lynx -source http://example.com/core/cron.php > /dev/null 2>&1 diff --git a/core/scripts/drupal.sh b/core/scripts/drupal.sh index 5d064f5..cf17e68 100755 --- a/core/scripts/drupal.sh +++ b/core/scripts/drupal.sh @@ -44,7 +44,7 @@ All arguments are long options. i.e. if URI is set to http://default/bar/foo.php and bar/foo.php exists, this script will be executed without bootstrapping Drupal. To execute Drupal's cron.php, specify - http://default/cron.php as the URI. + http://default/core/cron.php as the URI. To run this script without --root argument invoke it from the root directory diff --git a/core/scripts/password-hash.sh b/core/scripts/password-hash.sh index 004421a..66fcb26 100755 --- a/core/scripts/password-hash.sh +++ b/core/scripts/password-hash.sh @@ -78,10 +78,11 @@ while ($param = array_shift($_SERVER['argv'])) { } } +chdir('../..'); define('DRUPAL_ROOT', getcwd()); -include_once DRUPAL_ROOT . '/includes/password.inc'; -include_once DRUPAL_ROOT . '/includes/bootstrap.inc'; +include_once DRUPAL_ROOT . '/core/includes/password.inc'; +include_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; foreach ($passwords as $password) { print("\npassword: $password \t\thash: ". user_hash_password($password) ."\n"); diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh index 2cfbcac..9d907fc 100755 --- a/core/scripts/run-tests.sh +++ b/core/scripts/run-tests.sh @@ -139,7 +139,8 @@ All arguments are long options. --class Run tests identified by specific class names, instead of group names. --file Run tests identified by specific file names, instead of group names. - Specify the path and the extension (i.e. 'modules/user/user.test'). + Specify the path and the extension + (i.e. 'core/modules/user/user.test'). --xml @@ -302,9 +303,9 @@ function simpletest_script_init($server_software) { } } - chdir(realpath(dirname(__FILE__) . '/..')); + chdir(realpath(dirname(__FILE__) . '/../..')); define('DRUPAL_ROOT', getcwd()); - require_once DRUPAL_ROOT . '/includes/bootstrap.inc'; + require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; } /** diff --git a/core/themes/seven/template.php b/core/themes/seven/template.php index 4582749..ca7c3d0 100644 --- a/core/themes/seven/template.php +++ b/core/themes/seven/template.php @@ -100,14 +100,14 @@ function seven_tablesort_indicator($variables) { */ function seven_css_alter(&$css) { // Use Seven's vertical tabs style instead of the default one. - if (isset($css['misc/vertical-tabs.css'])) { - $css['misc/vertical-tabs.css']['data'] = drupal_get_path('theme', 'seven') . '/vertical-tabs.css'; + if (isset($css['core/misc/vertical-tabs.css'])) { + $css['core/misc/vertical-tabs.css']['data'] = drupal_get_path('theme', 'seven') . '/vertical-tabs.css'; } - if (isset($css['misc/vertical-tabs-rtl.css'])) { - $css['misc/vertical-tabs-rtl.css']['data'] = drupal_get_path('theme', 'seven') . '/vertical-tabs-rtl.css'; + if (isset($css['core/misc/vertical-tabs-rtl.css'])) { + $css['core/misc/vertical-tabs-rtl.css']['data'] = drupal_get_path('theme', 'seven') . '/vertical-tabs-rtl.css'; } // Use Seven's jQuery UI theme style instead of the default one. - if (isset($css['misc/ui/jquery.ui.theme.css'])) { - $css['misc/ui/jquery.ui.theme.css']['data'] = drupal_get_path('theme', 'seven') . '/jquery.ui.theme.css'; + if (isset($css['core/misc/ui/jquery.ui.theme.css'])) { + $css['core/misc/ui/jquery.ui.theme.css']['data'] = drupal_get_path('theme', 'seven') . '/jquery.ui.theme.css'; } } diff --git a/core/update.php b/core/update.php index 5a52ea5..cd3f055 100644 --- a/core/update.php +++ b/core/update.php @@ -1,15 +1,10 @@ Front page'; $links[] = 'Administration pages'; return $links; @@ -340,12 +343,12 @@ ini_set('display_errors', FALSE); // We prepare a minimal bootstrap for the update requirements check to avoid // reaching the PHP memory limit. -require_once DRUPAL_ROOT . '/includes/bootstrap.inc'; -require_once DRUPAL_ROOT . '/includes/update.inc'; -require_once DRUPAL_ROOT . '/includes/common.inc'; -require_once DRUPAL_ROOT . '/includes/file.inc'; -require_once DRUPAL_ROOT . '/includes/entity.inc'; -require_once DRUPAL_ROOT . '/includes/unicode.inc'; +require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; +require_once DRUPAL_ROOT . '/core/includes/update.inc'; +require_once DRUPAL_ROOT . '/core/includes/common.inc'; +require_once DRUPAL_ROOT . '/core/includes/file.inc'; +require_once DRUPAL_ROOT . '/core/includes/entity.inc'; +require_once DRUPAL_ROOT . '/core/includes/unicode.inc'; update_prepare_d8_bootstrap(); // Determine if the current user has access to run update.php. @@ -356,12 +359,12 @@ drupal_bootstrap(DRUPAL_BOOTSTRAP_SESSION); // configuration). $op = isset($_REQUEST['op']) ? $_REQUEST['op'] : ''; if (empty($op) && update_access_allowed()) { - require_once DRUPAL_ROOT . '/includes/install.inc'; - require_once DRUPAL_ROOT . '/modules/system/system.install'; + require_once DRUPAL_ROOT . '/core/includes/install.inc'; + require_once DRUPAL_ROOT . '/core/modules/system/system.install'; // Load module basics. - include_once DRUPAL_ROOT . '/includes/module.inc'; - $module_list['system']['filename'] = 'modules/system/system.module'; + include_once DRUPAL_ROOT . '/core/includes/module.inc'; + $module_list['system']['filename'] = 'core/modules/system/system.module'; module_list(TRUE, FALSE, FALSE, $module_list); drupal_load('module', 'system'); @@ -379,14 +382,14 @@ if (empty($op) && update_access_allowed()) { update_check_requirements(); // Redirect to the update information page if all requirements were met. - install_goto('update.php?op=info'); + install_goto('core/update.php?op=info'); } // update_fix_d8_requirements() needs to run before bootstrapping beyond path. // So bootstrap to DRUPAL_BOOTSTRAP_LANGUAGE then include unicode.inc. drupal_bootstrap(DRUPAL_BOOTSTRAP_LANGUAGE); -include_once DRUPAL_ROOT . '/includes/unicode.inc'; +include_once DRUPAL_ROOT . '/core/includes/unicode.inc'; update_fix_d8_requirements(); @@ -402,8 +405,8 @@ ini_set('display_errors', TRUE); // Only proceed with updates if the user is allowed to run them. if (update_access_allowed()) { - include_once DRUPAL_ROOT . '/includes/install.inc'; - include_once DRUPAL_ROOT . '/includes/batch.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc'; + include_once DRUPAL_ROOT . '/core/includes/batch.inc'; drupal_load_updates(); update_fix_compatibility(); @@ -423,7 +426,7 @@ if (update_access_allowed()) { case 'Apply pending updates': if (isset($_GET['token']) && $_GET['token'] == drupal_get_token('update')) { - update_batch($_POST['start'], $base_url . '/update.php?op=results', $base_url . '/update.php'); + update_batch($_POST['start'], $base_url . '/core/update.php?op=results', $base_url . '/core/update.php'); break; } diff --git a/core/xmlrpc.php b/core/xmlrpc.php index b202dc2..562aa81 100644 --- a/core/xmlrpc.php +++ b/core/xmlrpc.php @@ -5,14 +5,17 @@ * PHP page for handling incoming XML-RPC requests from clients. */ +// Change the directory to the Drupal root. +chdir('..'); + /** * Root directory of Drupal installation. */ define('DRUPAL_ROOT', getcwd()); -include_once DRUPAL_ROOT . '/includes/bootstrap.inc'; +include_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); -include_once DRUPAL_ROOT . '/includes/xmlrpc.inc'; -include_once DRUPAL_ROOT . '/includes/xmlrpcs.inc'; +include_once DRUPAL_ROOT . '/core/includes/xmlrpc.inc'; +include_once DRUPAL_ROOT . '/core/includes/xmlrpcs.inc'; xmlrpc_server(module_invoke_all('xmlrpc')); diff --git a/index.php b/index.php index 8b83199..b91fb1e 100644 --- a/index.php +++ b/index.php @@ -8,7 +8,7 @@ * prints the appropriate page. * * All Drupal code is released under the GNU General Public License. - * See COPYRIGHT.txt and LICENSE.txt. + * See COPYRIGHT.txt and LICENSE.txt files in the "core" directory. */ /** @@ -16,6 +16,6 @@ */ define('DRUPAL_ROOT', getcwd()); -require_once DRUPAL_ROOT . '/includes/bootstrap.inc'; +require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); menu_execute_active_handler(); diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php index 0472f02..c32f4f7 100644 --- a/sites/default/default.settings.php +++ b/sites/default/default.settings.php @@ -315,7 +315,7 @@ ini_set('session.cookie_lifetime', 2000000); * is explicitly set to maintenance mode through the administration page or when * the database is inactive due to an error. It can be set through the * 'maintenance_theme' key. The template file should also be copied into the - * theme. It is located inside 'modules/system/maintenance-page.tpl.php'. + * theme. It is located inside 'core/modules/system/maintenance-page.tpl.php'. * Note: This setting does not apply to installation and update pages. */ # $conf['maintenance_theme'] = 'bartik'; -- 1.7.4.1 From 485fd7fd1945aa51409a1019e64a1fc76a5c4188 Mon Sep 17 00:00:00 2001 From: Nathan Haug Date: Wed, 4 May 2011 19:13:00 -0600 Subject: [PATCH 4/4] Issue #22336 by quicksketch, scor, boombatower, and rfay. Move all core Drupal files under a core subdirectory. --- robots.txt | 20 +++----------------- 1 files changed, 3 insertions(+), 17 deletions(-) diff --git a/robots.txt b/robots.txt index 490fa59..aaf51ba 100644 --- a/robots.txt +++ b/robots.txt @@ -19,24 +19,10 @@ User-agent: * Crawl-delay: 10 # Directories -Disallow: /includes/ -Disallow: /misc/ -Disallow: /modules/ -Disallow: /profiles/ -Disallow: /scripts/ -Disallow: /themes/ +Disallow: /core/ # Files -Disallow: /CHANGELOG.txt -Disallow: /cron.php -Disallow: /INSTALL.mysql.txt -Disallow: /INSTALL.pgsql.txt -Disallow: /install.php -Disallow: /INSTALL.txt -Disallow: /LICENSE.txt -Disallow: /MAINTAINERS.txt -Disallow: /update.php -Disallow: /UPGRADE.txt -Disallow: /xmlrpc.php +Disallow: /README.txt +Disallow: /web.config # Paths (clean URLs) Disallow: /admin/ Disallow: /comment/reply/ -- 1.7.4.1