From 081f83b5440e0c2cb9f3cb21ac5bb1c5b99728aa Mon Sep 17 00:00:00 2001 From: Marco Villegas Date: Thu, 3 Nov 2011 06:41:54 -0500 Subject: [PATCH 1/2] Issue #7269 by marvil07: Add php extension to *.{inc,module} files. --- core/includes/{actions.inc => actions.inc.php} | 0 core/includes/{ajax.inc => ajax.inc.php} | 0 core/includes/{archiver.inc => archiver.inc.php} | 0 core/includes/{authorize.inc => authorize.inc.php} | 0 core/includes/{batch.inc => batch.inc.php} | 0 .../{batch.queue.inc => batch.queue.inc.php} | 0 core/includes/{bootstrap.inc => bootstrap.inc.php} | 0 .../{cache-install.inc => cache-install.inc.php} | 0 core/includes/{cache.inc => cache.inc.php} | 0 core/includes/{common.inc => common.inc.php} | 0 .../database/{database.inc => database.inc.php} | 0 core/includes/database/{log.inc => log.inc.php} | 0 .../mysql/{database.inc => database.inc.php} | 0 .../mysql/{install.inc => install.inc.php} | 0 .../database/mysql/{query.inc => query.inc.php} | 0 .../database/mysql/{schema.inc => schema.inc.php} | 0 .../pgsql/{database.inc => database.inc.php} | 0 .../pgsql/{install.inc => install.inc.php} | 0 .../database/pgsql/{query.inc => query.inc.php} | 0 .../database/pgsql/{schema.inc => schema.inc.php} | 0 .../database/pgsql/{select.inc => select.inc.php} | 0 .../database/{prefetch.inc => prefetch.inc.php} | 0 .../includes/database/{query.inc => query.inc.php} | 0 .../database/{schema.inc => schema.inc.php} | 0 .../database/{select.inc => select.inc.php} | 0 .../sqlite/{database.inc => database.inc.php} | 0 .../sqlite/{install.inc => install.inc.php} | 0 .../database/sqlite/{query.inc => query.inc.php} | 0 .../database/sqlite/{schema.inc => schema.inc.php} | 0 .../database/sqlite/{select.inc => select.inc.php} | 0 core/includes/{date.inc => date.inc.php} | 0 core/includes/{errors.inc => errors.inc.php} | 0 core/includes/{file.inc => file.inc.php} | 0 .../{file.mimetypes.inc => file.mimetypes.inc.php} | 0 .../{filetransfer.inc => filetransfer.inc.php} | 0 .../includes/filetransfer/{ftp.inc => ftp.inc.php} | 0 .../filetransfer/{local.inc => local.inc.php} | 0 .../includes/filetransfer/{ssh.inc => ssh.inc.php} | 0 core/includes/{form.inc => form.inc.php} | 0 core/includes/{gettext.inc => gettext.inc.php} | 0 core/includes/{graph.inc => graph.inc.php} | 0 core/includes/{image.inc => image.inc.php} | 0 .../{install.core.inc => install.core.inc.php} | 0 core/includes/{install.inc => install.inc.php} | 0 core/includes/{language.inc => language.inc.php} | 0 core/includes/{locale.inc => locale.inc.php} | 0 core/includes/{lock.inc => lock.inc.php} | 0 core/includes/{mail.inc => mail.inc.php} | 0 core/includes/{menu.inc => menu.inc.php} | 0 core/includes/{module.inc => module.inc.php} | 0 core/includes/{pager.inc => pager.inc.php} | 0 core/includes/{password.inc => password.inc.php} | 0 core/includes/{path.inc => path.inc.php} | 0 core/includes/{registry.inc => registry.inc.php} | 0 core/includes/{session.inc => session.inc.php} | 0 core/includes/{standard.inc => standard.inc.php} | 0 ...stream_wrappers.inc => stream_wrappers.inc.php} | 0 core/includes/{tablesort.inc => tablesort.inc.php} | 0 core/includes/{theme.inc => theme.inc.php} | 0 ...e.maintenance.inc => theme.maintenance.inc.php} | 0 core/includes/{token.inc => token.inc.php} | 0 ...icode.entities.inc => unicode.entities.inc.php} | 0 core/includes/{unicode.inc => unicode.inc.php} | 0 core/includes/{update.inc => update.inc.php} | 0 core/includes/{updater.inc => updater.inc.php} | 0 core/includes/{utility.inc => utility.inc.php} | 0 core/includes/{uuid.inc => uuid.inc.php} | 0 core/includes/{xmlrpc.inc => xmlrpc.inc.php} | 0 core/includes/{xmlrpcs.inc => xmlrpcs.inc.php} | 0 ...gregator.admin.inc => aggregator.admin.inc.php} | 0 ...ator.fetcher.inc => aggregator.fetcher.inc.php} | 0 .../{aggregator.module => aggregator.module.php} | 0 ...gregator.pages.inc => aggregator.pages.inc.php} | 0 ...egator.parser.inc => aggregator.parser.inc.php} | 0 ....processor.inc => aggregator.processor.inc.php} | 0 ...ator_test.module => aggregator_test.module.php} | 0 .../block/{block.admin.inc => block.admin.inc.php} | 0 .../block/{block.module => block.module.php} | 0 .../{block_test.module => block_test.module.php} | 0 .../book/{book.admin.inc => book.admin.inc.php} | 0 core/modules/book/{book.module => book.module.php} | 0 .../book/{book.pages.inc => book.pages.inc.php} | 0 .../color/{color.module => color.module.php} | 0 .../{comment.admin.inc => comment.admin.inc.php} | 0 .../comment/{comment.module => comment.module.php} | 0 .../{comment.pages.inc => comment.pages.inc.php} | 0 .../{comment.tokens.inc => comment.tokens.inc.php} | 0 .../{contact.admin.inc => contact.admin.inc.php} | 0 .../contact/{contact.module => contact.module.php} | 0 .../{contact.pages.inc => contact.pages.inc.php} | 0 .../{contextual.module => contextual.module.php} | 0 .../{dashboard.module => dashboard.module.php} | 0 .../dblog/{dblog.admin.inc => dblog.admin.inc.php} | 0 .../dblog/{dblog.module => dblog.module.php} | 0 ...ty.controller.inc => entity.controller.inc.php} | 0 .../entity/{entity.module => entity.module.php} | 0 .../{entity.query.inc => entity.query.inc.php} | 0 ...he_test.module => entity_cache_test.module.php} | 0 ...ule => entity_cache_test_dependency.module.php} | 0 ...est.module => entity_crud_hook_test.module.php} | 0 .../{field.attach.inc => field.attach.inc.php} | 0 .../field/{field.crud.inc => field.crud.inc.php} | 0 .../{field.default.inc => field.default.inc.php} | 0 .../field/{field.form.inc => field.form.inc.php} | 0 .../field/{field.info.inc => field.info.inc.php} | 0 .../field/{field.module => field.module.php} | 0 ...multilingual.inc => field.multilingual.inc.php} | 0 ...storage.module => field_sql_storage.module.php} | 0 .../modules/list/{list.module => list.module.php} | 0 .../{list_test.module => list_test.module.php} | 0 .../number/{number.module => number.module.php} | 0 .../options/{options.module => options.module.php} | 0 .../modules/text/{text.module => text.module.php} | 0 ...d_test.entity.inc => field_test.entity.inc.php} | 0 ...eld_test.field.inc => field_test.field.inc.php} | 0 .../{field_test.module => field_test.module.php} | 0 ...test.storage.inc => field_test.storage.inc.php} | 0 .../{field_ui.admin.inc => field_ui.admin.inc.php} | 0 .../{field_ui.module => field_ui.module.php} | 0 .../file/{file.field.inc => file.field.inc.php} | 0 core/modules/file/{file.module => file.module.php} | 0 ...ule_test.module => file_module_test.module.php} | 0 .../{filter.admin.inc => filter.admin.inc.php} | 0 .../filter/{filter.module => filter.module.php} | 0 .../{filter.pages.inc => filter.pages.inc.php} | 0 .../forum/{forum.admin.inc => forum.admin.inc.php} | 0 .../forum/{forum.module => forum.module.php} | 0 .../forum/{forum.pages.inc => forum.pages.inc.php} | 0 .../help/{help.admin.inc => help.admin.inc.php} | 0 core/modules/help/{help.module => help.module.php} | 0 .../image/{image.admin.inc => image.admin.inc.php} | 0 .../{image.effects.inc => image.effects.inc.php} | 0 .../image/{image.field.inc => image.field.inc.php} | 0 .../image/{image.module => image.module.php} | 0 ...le_test.module => image_module_test.module.php} | 0 .../{locale.admin.inc => locale.admin.inc.php} | 0 .../{locale.bulk.inc => locale.bulk.inc.php} | 0 .../locale/{locale.module => locale.module.php} | 0 .../{locale.pages.inc => locale.pages.inc.php} | 0 .../{locale_test.module => locale_test.module.php} | 0 .../menu/{menu.admin.inc => menu.admin.inc.php} | 0 core/modules/menu/{menu.module => menu.module.php} | 0 .../{content_types.inc => content_types.inc.php} | 0 .../node/{node.admin.inc => node.admin.inc.php} | 0 core/modules/node/{node.module => node.module.php} | 0 .../node/{node.pages.inc => node.pages.inc.php} | 0 .../node/{node.tokens.inc => node.tokens.inc.php} | 0 ...ess_test.module => node_access_test.module.php} | 0 .../{node_test.module => node_test.module.php} | 0 ...ption.module => node_test_exception.module.php} | 0 core/modules/openid/{openid.inc => openid.inc.php} | 0 .../openid/{openid.module => openid.module.php} | 0 .../{openid.pages.inc => openid.pages.inc.php} | 0 .../{openid_test.module => openid_test.module.php} | 0 .../overlay/{overlay.module => overlay.module.php} | 0 .../path/{path.admin.inc => path.admin.inc.php} | 0 core/modules/path/{path.module => path.module.php} | 0 core/modules/php/{php.module => php.module.php} | 0 core/modules/poll/{poll.module => poll.module.php} | 0 .../poll/{poll.pages.inc => poll.pages.inc.php} | 0 .../poll/{poll.tokens.inc => poll.tokens.inc.php} | 0 core/modules/rdf/{rdf.module => rdf.module.php} | 0 .../tests/{rdf_test.module => rdf_test.module.php} | 0 .../{search.admin.inc => search.admin.inc.php} | 0 ...search.extender.inc => search.extender.inc.php} | 0 .../search/{search.module => search.module.php} | 0 .../{search.pages.inc => search.pages.inc.php} | 0 ...form.module => search_embedded_form.module.php} | 0 ...ra_type.module => search_extra_type.module.php} | 0 .../{shortcut.admin.inc => shortcut.admin.inc.php} | 0 .../{shortcut.module => shortcut.module.php} | 0 .../{simpletest.module => simpletest.module.php} | 0 ...mpletest.pages.inc => simpletest.pages.inc.php} | 0 ...op_test.module => actions_loop_test.module.php} | 0 ...orms_test.module => ajax_forms_test.module.php} | 0 .../{ajax_test.module => ajax_test.module.php} | 0 ....callbacks.inc => batch_test.callbacks.inc.php} | 0 .../{batch_test.module => batch_test.module.php} | 0 .../{common_test.module => common_test.module.php} | 0 ...r.module => common_test_cron_helper.module.php} | 0 ...tabase_test.module => database_test.module.php} | 0 ...upal_system_listing_compatible_test.module.php} | 0 ...al_system_listing_incompatible_test.module.php} | 0 .../{error_test.module => error_test.module.php} | 0 .../{file_test.module => file_test.module.php} | 0 .../{filter_test.module => filter_test.module.php} | 0 .../{form_test.file.inc => form_test.file.inc.php} | 0 .../{form_test.module => form_test.module.php} | 0 .../{image_test.module => image_test.module.php} | 0 .../{menu_test.module => menu_test.module.php} | 0 ...dule_test.file.inc => module_test.file.inc.php} | 0 .../{module_test.module => module_test.module.php} | 0 ...1_test.module => requirements1_test.module.php} | 0 ...2_test.module => requirements2_test.module.php} | 0 ...session_test.module => session_test.module.php} | 0 ....module => system_dependencies_test.module.php} | 0 .../{system_test.module => system_test.module.php} | 0 ...xonomy_test.module => taxonomy_test.module.php} | 0 .../{theme_test.module => theme_test.module.php} | 0 ...t_test.module => update_script_test.module.php} | 0 ...date_test_1.module => update_test_1.module.php} | 0 ...date_test_2.module => update_test_2.module.php} | 0 ...date_test_3.module => update_test_3.module.php} | 0 ...alter_test.module => url_alter_test.module.php} | 0 .../{xmlrpc_test.module => xmlrpc_test.module.php} | 0 ...atistics.admin.inc => statistics.admin.inc.php} | 0 .../{statistics.module => statistics.module.php} | 0 ...atistics.pages.inc => statistics.pages.inc.php} | 0 ...istics.tokens.inc => statistics.tokens.inc.php} | 0 .../syslog/{syslog.module => syslog.module.php} | 0 .../system/{image.gd.inc => image.gd.inc.php} | 0 .../{system.admin.inc => system.admin.inc.php} | 0 ...system.archiver.inc => system.archiver.inc.php} | 0 .../{system.mail.inc => system.mail.inc.php} | 0 .../system/{system.module => system.module.php} | 0 .../{system.queue.inc => system.queue.inc.php} | 0 .../system/{system.tar.inc => system.tar.inc.php} | 0 .../{system.tokens.inc => system.tokens.inc.php} | 0 .../{system.updater.inc => system.updater.inc.php} | 0 .../{taxonomy.admin.inc => taxonomy.admin.inc.php} | 0 .../{taxonomy.module => taxonomy.module.php} | 0 .../{taxonomy.pages.inc => taxonomy.pages.inc.php} | 0 ...taxonomy.tokens.inc => taxonomy.tokens.inc.php} | 0 .../toolbar/{toolbar.module => toolbar.module.php} | 0 .../tracker/{tracker.module => tracker.module.php} | 0 .../{tracker.pages.inc => tracker.pages.inc.php} | 0 ...ion_test.module => translation_test.module.php} | 0 .../{translation.module => translation.module.php} | 0 ...slation.pages.inc => translation.pages.inc.php} | 0 ...trigger_test.module => trigger_test.module.php} | 0 .../{trigger.admin.inc => trigger.admin.inc.php} | 0 .../trigger/{trigger.module => trigger.module.php} | 0 ...date_test.module => aaa_update_test.module.php} | 0 ...date_test.module => bbb_update_test.module.php} | 0 ...date_test.module => ccc_update_test.module.php} | 0 .../{update_test.module => update_test.module.php} | 0 ...date.authorize.inc => update.authorize.inc.php} | 0 .../{update.compare.inc => update.compare.inc.php} | 0 .../{update.fetch.inc => update.fetch.inc.php} | 0 .../{update.manager.inc => update.manager.inc.php} | 0 .../update/{update.module => update.module.php} | 0 .../{update.report.inc => update.report.inc.php} | 0 ...update.settings.inc => update.settings.inc.php} | 0 ..._form_test.module => user_form_test.module.php} | 0 .../user/{user.admin.inc => user.admin.inc.php} | 0 .../user/{user.entity.inc => user.entity.inc.php} | 0 core/modules/user/{user.module => user.module.php} | 0 .../user/{user.pages.inc => user.pages.inc.php} | 0 .../user/{user.tokens.inc => user.tokens.inc.php} | 0 .../bartik/color/{color.inc => color.inc.php} | 0 ...upal_system_listing_compatible_test.module.php} | 0 ...al_system_listing_incompatible_test.module.php} | 0 252 files changed, 0 insertions(+), 0 deletions(-) rename core/includes/{actions.inc => actions.inc.php} (100%) rename core/includes/{ajax.inc => ajax.inc.php} (100%) rename core/includes/{archiver.inc => archiver.inc.php} (100%) rename core/includes/{authorize.inc => authorize.inc.php} (100%) rename core/includes/{batch.inc => batch.inc.php} (100%) rename core/includes/{batch.queue.inc => batch.queue.inc.php} (100%) rename core/includes/{bootstrap.inc => bootstrap.inc.php} (100%) rename core/includes/{cache-install.inc => cache-install.inc.php} (100%) rename core/includes/{cache.inc => cache.inc.php} (100%) rename core/includes/{common.inc => common.inc.php} (100%) rename core/includes/database/{database.inc => database.inc.php} (100%) rename core/includes/database/{log.inc => log.inc.php} (100%) rename core/includes/database/mysql/{database.inc => database.inc.php} (100%) rename core/includes/database/mysql/{install.inc => install.inc.php} (100%) rename core/includes/database/mysql/{query.inc => query.inc.php} (100%) rename core/includes/database/mysql/{schema.inc => schema.inc.php} (100%) rename core/includes/database/pgsql/{database.inc => database.inc.php} (100%) rename core/includes/database/pgsql/{install.inc => install.inc.php} (100%) rename core/includes/database/pgsql/{query.inc => query.inc.php} (100%) rename core/includes/database/pgsql/{schema.inc => schema.inc.php} (100%) rename core/includes/database/pgsql/{select.inc => select.inc.php} (100%) rename core/includes/database/{prefetch.inc => prefetch.inc.php} (100%) rename core/includes/database/{query.inc => query.inc.php} (100%) rename core/includes/database/{schema.inc => schema.inc.php} (100%) rename core/includes/database/{select.inc => select.inc.php} (100%) rename core/includes/database/sqlite/{database.inc => database.inc.php} (100%) rename core/includes/database/sqlite/{install.inc => install.inc.php} (100%) rename core/includes/database/sqlite/{query.inc => query.inc.php} (100%) rename core/includes/database/sqlite/{schema.inc => schema.inc.php} (100%) rename core/includes/database/sqlite/{select.inc => select.inc.php} (100%) rename core/includes/{date.inc => date.inc.php} (100%) rename core/includes/{errors.inc => errors.inc.php} (100%) rename core/includes/{file.inc => file.inc.php} (100%) rename core/includes/{file.mimetypes.inc => file.mimetypes.inc.php} (100%) rename core/includes/filetransfer/{filetransfer.inc => filetransfer.inc.php} (100%) rename core/includes/filetransfer/{ftp.inc => ftp.inc.php} (100%) rename core/includes/filetransfer/{local.inc => local.inc.php} (100%) rename core/includes/filetransfer/{ssh.inc => ssh.inc.php} (100%) rename core/includes/{form.inc => form.inc.php} (100%) rename core/includes/{gettext.inc => gettext.inc.php} (100%) rename core/includes/{graph.inc => graph.inc.php} (100%) rename core/includes/{image.inc => image.inc.php} (100%) rename core/includes/{install.core.inc => install.core.inc.php} (100%) rename core/includes/{install.inc => install.inc.php} (100%) rename core/includes/{language.inc => language.inc.php} (100%) rename core/includes/{locale.inc => locale.inc.php} (100%) rename core/includes/{lock.inc => lock.inc.php} (100%) rename core/includes/{mail.inc => mail.inc.php} (100%) rename core/includes/{menu.inc => menu.inc.php} (100%) rename core/includes/{module.inc => module.inc.php} (100%) rename core/includes/{pager.inc => pager.inc.php} (100%) rename core/includes/{password.inc => password.inc.php} (100%) rename core/includes/{path.inc => path.inc.php} (100%) rename core/includes/{registry.inc => registry.inc.php} (100%) rename core/includes/{session.inc => session.inc.php} (100%) rename core/includes/{standard.inc => standard.inc.php} (100%) rename core/includes/{stream_wrappers.inc => stream_wrappers.inc.php} (100%) rename core/includes/{tablesort.inc => tablesort.inc.php} (100%) rename core/includes/{theme.inc => theme.inc.php} (100%) rename core/includes/{theme.maintenance.inc => theme.maintenance.inc.php} (100%) rename core/includes/{token.inc => token.inc.php} (100%) rename core/includes/{unicode.entities.inc => unicode.entities.inc.php} (100%) rename core/includes/{unicode.inc => unicode.inc.php} (100%) rename core/includes/{update.inc => update.inc.php} (100%) rename core/includes/{updater.inc => updater.inc.php} (100%) rename core/includes/{utility.inc => utility.inc.php} (100%) rename core/includes/{uuid.inc => uuid.inc.php} (100%) rename core/includes/{xmlrpc.inc => xmlrpc.inc.php} (100%) rename core/includes/{xmlrpcs.inc => xmlrpcs.inc.php} (100%) rename core/modules/aggregator/{aggregator.admin.inc => aggregator.admin.inc.php} (100%) rename core/modules/aggregator/{aggregator.fetcher.inc => aggregator.fetcher.inc.php} (100%) rename core/modules/aggregator/{aggregator.module => aggregator.module.php} (100%) rename core/modules/aggregator/{aggregator.pages.inc => aggregator.pages.inc.php} (100%) rename core/modules/aggregator/{aggregator.parser.inc => aggregator.parser.inc.php} (100%) rename core/modules/aggregator/{aggregator.processor.inc => aggregator.processor.inc.php} (100%) rename core/modules/aggregator/tests/{aggregator_test.module => aggregator_test.module.php} (100%) rename core/modules/block/{block.admin.inc => block.admin.inc.php} (100%) rename core/modules/block/{block.module => block.module.php} (100%) rename core/modules/block/tests/{block_test.module => block_test.module.php} (100%) rename core/modules/book/{book.admin.inc => book.admin.inc.php} (100%) rename core/modules/book/{book.module => book.module.php} (100%) rename core/modules/book/{book.pages.inc => book.pages.inc.php} (100%) rename core/modules/color/{color.module => color.module.php} (100%) rename core/modules/comment/{comment.admin.inc => comment.admin.inc.php} (100%) rename core/modules/comment/{comment.module => comment.module.php} (100%) rename core/modules/comment/{comment.pages.inc => comment.pages.inc.php} (100%) rename core/modules/comment/{comment.tokens.inc => comment.tokens.inc.php} (100%) rename core/modules/contact/{contact.admin.inc => contact.admin.inc.php} (100%) rename core/modules/contact/{contact.module => contact.module.php} (100%) rename core/modules/contact/{contact.pages.inc => contact.pages.inc.php} (100%) rename core/modules/contextual/{contextual.module => contextual.module.php} (100%) rename core/modules/dashboard/{dashboard.module => dashboard.module.php} (100%) rename core/modules/dblog/{dblog.admin.inc => dblog.admin.inc.php} (100%) rename core/modules/dblog/{dblog.module => dblog.module.php} (100%) rename core/modules/entity/{entity.controller.inc => entity.controller.inc.php} (100%) rename core/modules/entity/{entity.module => entity.module.php} (100%) rename core/modules/entity/{entity.query.inc => entity.query.inc.php} (100%) rename core/modules/entity/tests/{entity_cache_test.module => entity_cache_test.module.php} (100%) rename core/modules/entity/tests/{entity_cache_test_dependency.module => entity_cache_test_dependency.module.php} (100%) rename core/modules/entity/tests/{entity_crud_hook_test.module => entity_crud_hook_test.module.php} (100%) rename core/modules/field/{field.attach.inc => field.attach.inc.php} (100%) rename core/modules/field/{field.crud.inc => field.crud.inc.php} (100%) rename core/modules/field/{field.default.inc => field.default.inc.php} (100%) rename core/modules/field/{field.form.inc => field.form.inc.php} (100%) rename core/modules/field/{field.info.inc => field.info.inc.php} (100%) rename core/modules/field/{field.module => field.module.php} (100%) rename core/modules/field/{field.multilingual.inc => field.multilingual.inc.php} (100%) rename core/modules/field/modules/field_sql_storage/{field_sql_storage.module => field_sql_storage.module.php} (100%) rename core/modules/field/modules/list/{list.module => list.module.php} (100%) rename core/modules/field/modules/list/tests/{list_test.module => list_test.module.php} (100%) rename core/modules/field/modules/number/{number.module => number.module.php} (100%) rename core/modules/field/modules/options/{options.module => options.module.php} (100%) rename core/modules/field/modules/text/{text.module => text.module.php} (100%) rename core/modules/field/tests/{field_test.entity.inc => field_test.entity.inc.php} (100%) rename core/modules/field/tests/{field_test.field.inc => field_test.field.inc.php} (100%) rename core/modules/field/tests/{field_test.module => field_test.module.php} (100%) rename core/modules/field/tests/{field_test.storage.inc => field_test.storage.inc.php} (100%) rename core/modules/field_ui/{field_ui.admin.inc => field_ui.admin.inc.php} (100%) rename core/modules/field_ui/{field_ui.module => field_ui.module.php} (100%) rename core/modules/file/{file.field.inc => file.field.inc.php} (100%) rename core/modules/file/{file.module => file.module.php} (100%) rename core/modules/file/tests/{file_module_test.module => file_module_test.module.php} (100%) rename core/modules/filter/{filter.admin.inc => filter.admin.inc.php} (100%) rename core/modules/filter/{filter.module => filter.module.php} (100%) rename core/modules/filter/{filter.pages.inc => filter.pages.inc.php} (100%) rename core/modules/forum/{forum.admin.inc => forum.admin.inc.php} (100%) rename core/modules/forum/{forum.module => forum.module.php} (100%) rename core/modules/forum/{forum.pages.inc => forum.pages.inc.php} (100%) rename core/modules/help/{help.admin.inc => help.admin.inc.php} (100%) rename core/modules/help/{help.module => help.module.php} (100%) rename core/modules/image/{image.admin.inc => image.admin.inc.php} (100%) rename core/modules/image/{image.effects.inc => image.effects.inc.php} (100%) rename core/modules/image/{image.field.inc => image.field.inc.php} (100%) rename core/modules/image/{image.module => image.module.php} (100%) rename core/modules/image/tests/{image_module_test.module => image_module_test.module.php} (100%) rename core/modules/locale/{locale.admin.inc => locale.admin.inc.php} (100%) rename core/modules/locale/{locale.bulk.inc => locale.bulk.inc.php} (100%) rename core/modules/locale/{locale.module => locale.module.php} (100%) rename core/modules/locale/{locale.pages.inc => locale.pages.inc.php} (100%) rename core/modules/locale/tests/{locale_test.module => locale_test.module.php} (100%) rename core/modules/menu/{menu.admin.inc => menu.admin.inc.php} (100%) rename core/modules/menu/{menu.module => menu.module.php} (100%) rename core/modules/node/{content_types.inc => content_types.inc.php} (100%) rename core/modules/node/{node.admin.inc => node.admin.inc.php} (100%) rename core/modules/node/{node.module => node.module.php} (100%) rename core/modules/node/{node.pages.inc => node.pages.inc.php} (100%) rename core/modules/node/{node.tokens.inc => node.tokens.inc.php} (100%) rename core/modules/node/tests/{node_access_test.module => node_access_test.module.php} (100%) rename core/modules/node/tests/{node_test.module => node_test.module.php} (100%) rename core/modules/node/tests/{node_test_exception.module => node_test_exception.module.php} (100%) rename core/modules/openid/{openid.inc => openid.inc.php} (100%) rename core/modules/openid/{openid.module => openid.module.php} (100%) rename core/modules/openid/{openid.pages.inc => openid.pages.inc.php} (100%) rename core/modules/openid/tests/{openid_test.module => openid_test.module.php} (100%) rename core/modules/overlay/{overlay.module => overlay.module.php} (100%) rename core/modules/path/{path.admin.inc => path.admin.inc.php} (100%) rename core/modules/path/{path.module => path.module.php} (100%) rename core/modules/php/{php.module => php.module.php} (100%) rename core/modules/poll/{poll.module => poll.module.php} (100%) rename core/modules/poll/{poll.pages.inc => poll.pages.inc.php} (100%) rename core/modules/poll/{poll.tokens.inc => poll.tokens.inc.php} (100%) rename core/modules/rdf/{rdf.module => rdf.module.php} (100%) rename core/modules/rdf/tests/{rdf_test.module => rdf_test.module.php} (100%) rename core/modules/search/{search.admin.inc => search.admin.inc.php} (100%) rename core/modules/search/{search.extender.inc => search.extender.inc.php} (100%) rename core/modules/search/{search.module => search.module.php} (100%) rename core/modules/search/{search.pages.inc => search.pages.inc.php} (100%) rename core/modules/search/tests/{search_embedded_form.module => search_embedded_form.module.php} (100%) rename core/modules/search/tests/{search_extra_type.module => search_extra_type.module.php} (100%) rename core/modules/shortcut/{shortcut.admin.inc => shortcut.admin.inc.php} (100%) rename core/modules/shortcut/{shortcut.module => shortcut.module.php} (100%) rename core/modules/simpletest/{simpletest.module => simpletest.module.php} (100%) rename core/modules/simpletest/{simpletest.pages.inc => simpletest.pages.inc.php} (100%) rename core/modules/simpletest/tests/{actions_loop_test.module => actions_loop_test.module.php} (100%) rename core/modules/simpletest/tests/{ajax_forms_test.module => ajax_forms_test.module.php} (100%) rename core/modules/simpletest/tests/{ajax_test.module => ajax_test.module.php} (100%) rename core/modules/simpletest/tests/{batch_test.callbacks.inc => batch_test.callbacks.inc.php} (100%) rename core/modules/simpletest/tests/{batch_test.module => batch_test.module.php} (100%) rename core/modules/simpletest/tests/{common_test.module => common_test.module.php} (100%) rename core/modules/simpletest/tests/{common_test_cron_helper.module => common_test_cron_helper.module.php} (100%) rename core/modules/simpletest/tests/{database_test.module => database_test.module.php} (100%) rename core/modules/simpletest/tests/drupal_system_listing_compatible_test/{drupal_system_listing_compatible_test.module => drupal_system_listing_compatible_test.module.php} (100%) rename core/modules/simpletest/tests/drupal_system_listing_incompatible_test/{drupal_system_listing_incompatible_test.module => drupal_system_listing_incompatible_test.module.php} (100%) rename core/modules/simpletest/tests/{error_test.module => error_test.module.php} (100%) rename core/modules/simpletest/tests/{file_test.module => file_test.module.php} (100%) rename core/modules/simpletest/tests/{filter_test.module => filter_test.module.php} (100%) rename core/modules/simpletest/tests/{form_test.file.inc => form_test.file.inc.php} (100%) rename core/modules/simpletest/tests/{form_test.module => form_test.module.php} (100%) rename core/modules/simpletest/tests/{image_test.module => image_test.module.php} (100%) rename core/modules/simpletest/tests/{menu_test.module => menu_test.module.php} (100%) rename core/modules/simpletest/tests/{module_test.file.inc => module_test.file.inc.php} (100%) rename core/modules/simpletest/tests/{module_test.module => module_test.module.php} (100%) rename core/modules/simpletest/tests/{requirements1_test.module => requirements1_test.module.php} (100%) rename core/modules/simpletest/tests/{requirements2_test.module => requirements2_test.module.php} (100%) rename core/modules/simpletest/tests/{session_test.module => session_test.module.php} (100%) rename core/modules/simpletest/tests/{system_dependencies_test.module => system_dependencies_test.module.php} (100%) rename core/modules/simpletest/tests/{system_test.module => system_test.module.php} (100%) rename core/modules/simpletest/tests/{taxonomy_test.module => taxonomy_test.module.php} (100%) rename core/modules/simpletest/tests/{theme_test.module => theme_test.module.php} (100%) rename core/modules/simpletest/tests/{update_script_test.module => update_script_test.module.php} (100%) rename core/modules/simpletest/tests/{update_test_1.module => update_test_1.module.php} (100%) rename core/modules/simpletest/tests/{update_test_2.module => update_test_2.module.php} (100%) rename core/modules/simpletest/tests/{update_test_3.module => update_test_3.module.php} (100%) rename core/modules/simpletest/tests/{url_alter_test.module => url_alter_test.module.php} (100%) rename core/modules/simpletest/tests/{xmlrpc_test.module => xmlrpc_test.module.php} (100%) rename core/modules/statistics/{statistics.admin.inc => statistics.admin.inc.php} (100%) rename core/modules/statistics/{statistics.module => statistics.module.php} (100%) rename core/modules/statistics/{statistics.pages.inc => statistics.pages.inc.php} (100%) rename core/modules/statistics/{statistics.tokens.inc => statistics.tokens.inc.php} (100%) rename core/modules/syslog/{syslog.module => syslog.module.php} (100%) rename core/modules/system/{image.gd.inc => image.gd.inc.php} (100%) rename core/modules/system/{system.admin.inc => system.admin.inc.php} (100%) rename core/modules/system/{system.archiver.inc => system.archiver.inc.php} (100%) rename core/modules/system/{system.mail.inc => system.mail.inc.php} (100%) rename core/modules/system/{system.module => system.module.php} (100%) rename core/modules/system/{system.queue.inc => system.queue.inc.php} (100%) rename core/modules/system/{system.tar.inc => system.tar.inc.php} (100%) rename core/modules/system/{system.tokens.inc => system.tokens.inc.php} (100%) rename core/modules/system/{system.updater.inc => system.updater.inc.php} (100%) rename core/modules/taxonomy/{taxonomy.admin.inc => taxonomy.admin.inc.php} (100%) rename core/modules/taxonomy/{taxonomy.module => taxonomy.module.php} (100%) rename core/modules/taxonomy/{taxonomy.pages.inc => taxonomy.pages.inc.php} (100%) rename core/modules/taxonomy/{taxonomy.tokens.inc => taxonomy.tokens.inc.php} (100%) rename core/modules/toolbar/{toolbar.module => toolbar.module.php} (100%) rename core/modules/tracker/{tracker.module => tracker.module.php} (100%) rename core/modules/tracker/{tracker.pages.inc => tracker.pages.inc.php} (100%) rename core/modules/translation/tests/{translation_test.module => translation_test.module.php} (100%) rename core/modules/translation/{translation.module => translation.module.php} (100%) rename core/modules/translation/{translation.pages.inc => translation.pages.inc.php} (100%) rename core/modules/trigger/tests/{trigger_test.module => trigger_test.module.php} (100%) rename core/modules/trigger/{trigger.admin.inc => trigger.admin.inc.php} (100%) rename core/modules/trigger/{trigger.module => trigger.module.php} (100%) rename core/modules/update/tests/{aaa_update_test.module => aaa_update_test.module.php} (100%) rename core/modules/update/tests/{bbb_update_test.module => bbb_update_test.module.php} (100%) rename core/modules/update/tests/{ccc_update_test.module => ccc_update_test.module.php} (100%) rename core/modules/update/tests/{update_test.module => update_test.module.php} (100%) rename core/modules/update/{update.authorize.inc => update.authorize.inc.php} (100%) rename core/modules/update/{update.compare.inc => update.compare.inc.php} (100%) rename core/modules/update/{update.fetch.inc => update.fetch.inc.php} (100%) rename core/modules/update/{update.manager.inc => update.manager.inc.php} (100%) rename core/modules/update/{update.module => update.module.php} (100%) rename core/modules/update/{update.report.inc => update.report.inc.php} (100%) rename core/modules/update/{update.settings.inc => update.settings.inc.php} (100%) rename core/modules/user/tests/{user_form_test.module => user_form_test.module.php} (100%) rename core/modules/user/{user.admin.inc => user.admin.inc.php} (100%) rename core/modules/user/{user.entity.inc => user.entity.inc.php} (100%) rename core/modules/user/{user.module => user.module.php} (100%) rename core/modules/user/{user.pages.inc => user.pages.inc.php} (100%) rename core/modules/user/{user.tokens.inc => user.tokens.inc.php} (100%) rename core/themes/bartik/color/{color.inc => color.inc.php} (100%) rename profiles/testing/modules/drupal_system_listing_compatible_test/{drupal_system_listing_compatible_test.module => drupal_system_listing_compatible_test.module.php} (100%) rename profiles/testing/modules/drupal_system_listing_incompatible_test/{drupal_system_listing_incompatible_test.module => drupal_system_listing_incompatible_test.module.php} (100%) diff --git a/core/includes/actions.inc b/core/includes/actions.inc.php similarity index 100% rename from core/includes/actions.inc rename to core/includes/actions.inc.php diff --git a/core/includes/ajax.inc b/core/includes/ajax.inc.php similarity index 100% rename from core/includes/ajax.inc rename to core/includes/ajax.inc.php diff --git a/core/includes/archiver.inc b/core/includes/archiver.inc.php similarity index 100% rename from core/includes/archiver.inc rename to core/includes/archiver.inc.php diff --git a/core/includes/authorize.inc b/core/includes/authorize.inc.php similarity index 100% rename from core/includes/authorize.inc rename to core/includes/authorize.inc.php diff --git a/core/includes/batch.inc b/core/includes/batch.inc.php similarity index 100% rename from core/includes/batch.inc rename to core/includes/batch.inc.php diff --git a/core/includes/batch.queue.inc b/core/includes/batch.queue.inc.php similarity index 100% rename from core/includes/batch.queue.inc rename to core/includes/batch.queue.inc.php diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc.php similarity index 100% rename from core/includes/bootstrap.inc rename to core/includes/bootstrap.inc.php diff --git a/core/includes/cache-install.inc b/core/includes/cache-install.inc.php similarity index 100% rename from core/includes/cache-install.inc rename to core/includes/cache-install.inc.php diff --git a/core/includes/cache.inc b/core/includes/cache.inc.php similarity index 100% rename from core/includes/cache.inc rename to core/includes/cache.inc.php diff --git a/core/includes/common.inc b/core/includes/common.inc.php similarity index 100% rename from core/includes/common.inc rename to core/includes/common.inc.php diff --git a/core/includes/database/database.inc b/core/includes/database/database.inc.php similarity index 100% rename from core/includes/database/database.inc rename to core/includes/database/database.inc.php diff --git a/core/includes/database/log.inc b/core/includes/database/log.inc.php similarity index 100% rename from core/includes/database/log.inc rename to core/includes/database/log.inc.php diff --git a/core/includes/database/mysql/database.inc b/core/includes/database/mysql/database.inc.php similarity index 100% rename from core/includes/database/mysql/database.inc rename to core/includes/database/mysql/database.inc.php diff --git a/core/includes/database/mysql/install.inc b/core/includes/database/mysql/install.inc.php similarity index 100% rename from core/includes/database/mysql/install.inc rename to core/includes/database/mysql/install.inc.php diff --git a/core/includes/database/mysql/query.inc b/core/includes/database/mysql/query.inc.php similarity index 100% rename from core/includes/database/mysql/query.inc rename to core/includes/database/mysql/query.inc.php diff --git a/core/includes/database/mysql/schema.inc b/core/includes/database/mysql/schema.inc.php similarity index 100% rename from core/includes/database/mysql/schema.inc rename to core/includes/database/mysql/schema.inc.php diff --git a/core/includes/database/pgsql/database.inc b/core/includes/database/pgsql/database.inc.php similarity index 100% rename from core/includes/database/pgsql/database.inc rename to core/includes/database/pgsql/database.inc.php diff --git a/core/includes/database/pgsql/install.inc b/core/includes/database/pgsql/install.inc.php similarity index 100% rename from core/includes/database/pgsql/install.inc rename to core/includes/database/pgsql/install.inc.php diff --git a/core/includes/database/pgsql/query.inc b/core/includes/database/pgsql/query.inc.php similarity index 100% rename from core/includes/database/pgsql/query.inc rename to core/includes/database/pgsql/query.inc.php diff --git a/core/includes/database/pgsql/schema.inc b/core/includes/database/pgsql/schema.inc.php similarity index 100% rename from core/includes/database/pgsql/schema.inc rename to core/includes/database/pgsql/schema.inc.php diff --git a/core/includes/database/pgsql/select.inc b/core/includes/database/pgsql/select.inc.php similarity index 100% rename from core/includes/database/pgsql/select.inc rename to core/includes/database/pgsql/select.inc.php diff --git a/core/includes/database/prefetch.inc b/core/includes/database/prefetch.inc.php similarity index 100% rename from core/includes/database/prefetch.inc rename to core/includes/database/prefetch.inc.php diff --git a/core/includes/database/query.inc b/core/includes/database/query.inc.php similarity index 100% rename from core/includes/database/query.inc rename to core/includes/database/query.inc.php diff --git a/core/includes/database/schema.inc b/core/includes/database/schema.inc.php similarity index 100% rename from core/includes/database/schema.inc rename to core/includes/database/schema.inc.php diff --git a/core/includes/database/select.inc b/core/includes/database/select.inc.php similarity index 100% rename from core/includes/database/select.inc rename to core/includes/database/select.inc.php diff --git a/core/includes/database/sqlite/database.inc b/core/includes/database/sqlite/database.inc.php similarity index 100% rename from core/includes/database/sqlite/database.inc rename to core/includes/database/sqlite/database.inc.php diff --git a/core/includes/database/sqlite/install.inc b/core/includes/database/sqlite/install.inc.php similarity index 100% rename from core/includes/database/sqlite/install.inc rename to core/includes/database/sqlite/install.inc.php diff --git a/core/includes/database/sqlite/query.inc b/core/includes/database/sqlite/query.inc.php similarity index 100% rename from core/includes/database/sqlite/query.inc rename to core/includes/database/sqlite/query.inc.php diff --git a/core/includes/database/sqlite/schema.inc b/core/includes/database/sqlite/schema.inc.php similarity index 100% rename from core/includes/database/sqlite/schema.inc rename to core/includes/database/sqlite/schema.inc.php diff --git a/core/includes/database/sqlite/select.inc b/core/includes/database/sqlite/select.inc.php similarity index 100% rename from core/includes/database/sqlite/select.inc rename to core/includes/database/sqlite/select.inc.php diff --git a/core/includes/date.inc b/core/includes/date.inc.php similarity index 100% rename from core/includes/date.inc rename to core/includes/date.inc.php diff --git a/core/includes/errors.inc b/core/includes/errors.inc.php similarity index 100% rename from core/includes/errors.inc rename to core/includes/errors.inc.php diff --git a/core/includes/file.inc b/core/includes/file.inc.php similarity index 100% rename from core/includes/file.inc rename to core/includes/file.inc.php diff --git a/core/includes/file.mimetypes.inc b/core/includes/file.mimetypes.inc.php similarity index 100% rename from core/includes/file.mimetypes.inc rename to core/includes/file.mimetypes.inc.php diff --git a/core/includes/filetransfer/filetransfer.inc b/core/includes/filetransfer/filetransfer.inc.php similarity index 100% rename from core/includes/filetransfer/filetransfer.inc rename to core/includes/filetransfer/filetransfer.inc.php diff --git a/core/includes/filetransfer/ftp.inc b/core/includes/filetransfer/ftp.inc.php similarity index 100% rename from core/includes/filetransfer/ftp.inc rename to core/includes/filetransfer/ftp.inc.php diff --git a/core/includes/filetransfer/local.inc b/core/includes/filetransfer/local.inc.php similarity index 100% rename from core/includes/filetransfer/local.inc rename to core/includes/filetransfer/local.inc.php diff --git a/core/includes/filetransfer/ssh.inc b/core/includes/filetransfer/ssh.inc.php similarity index 100% rename from core/includes/filetransfer/ssh.inc rename to core/includes/filetransfer/ssh.inc.php diff --git a/core/includes/form.inc b/core/includes/form.inc.php similarity index 100% rename from core/includes/form.inc rename to core/includes/form.inc.php diff --git a/core/includes/gettext.inc b/core/includes/gettext.inc.php similarity index 100% rename from core/includes/gettext.inc rename to core/includes/gettext.inc.php diff --git a/core/includes/graph.inc b/core/includes/graph.inc.php similarity index 100% rename from core/includes/graph.inc rename to core/includes/graph.inc.php diff --git a/core/includes/image.inc b/core/includes/image.inc.php similarity index 100% rename from core/includes/image.inc rename to core/includes/image.inc.php diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc.php similarity index 100% rename from core/includes/install.core.inc rename to core/includes/install.core.inc.php diff --git a/core/includes/install.inc b/core/includes/install.inc.php similarity index 100% rename from core/includes/install.inc rename to core/includes/install.inc.php diff --git a/core/includes/language.inc b/core/includes/language.inc.php similarity index 100% rename from core/includes/language.inc rename to core/includes/language.inc.php diff --git a/core/includes/locale.inc b/core/includes/locale.inc.php similarity index 100% rename from core/includes/locale.inc rename to core/includes/locale.inc.php diff --git a/core/includes/lock.inc b/core/includes/lock.inc.php similarity index 100% rename from core/includes/lock.inc rename to core/includes/lock.inc.php diff --git a/core/includes/mail.inc b/core/includes/mail.inc.php similarity index 100% rename from core/includes/mail.inc rename to core/includes/mail.inc.php diff --git a/core/includes/menu.inc b/core/includes/menu.inc.php similarity index 100% rename from core/includes/menu.inc rename to core/includes/menu.inc.php diff --git a/core/includes/module.inc b/core/includes/module.inc.php similarity index 100% rename from core/includes/module.inc rename to core/includes/module.inc.php diff --git a/core/includes/pager.inc b/core/includes/pager.inc.php similarity index 100% rename from core/includes/pager.inc rename to core/includes/pager.inc.php diff --git a/core/includes/password.inc b/core/includes/password.inc.php similarity index 100% rename from core/includes/password.inc rename to core/includes/password.inc.php diff --git a/core/includes/path.inc b/core/includes/path.inc.php similarity index 100% rename from core/includes/path.inc rename to core/includes/path.inc.php diff --git a/core/includes/registry.inc b/core/includes/registry.inc.php similarity index 100% rename from core/includes/registry.inc rename to core/includes/registry.inc.php diff --git a/core/includes/session.inc b/core/includes/session.inc.php similarity index 100% rename from core/includes/session.inc rename to core/includes/session.inc.php diff --git a/core/includes/standard.inc b/core/includes/standard.inc.php similarity index 100% rename from core/includes/standard.inc rename to core/includes/standard.inc.php diff --git a/core/includes/stream_wrappers.inc b/core/includes/stream_wrappers.inc.php similarity index 100% rename from core/includes/stream_wrappers.inc rename to core/includes/stream_wrappers.inc.php diff --git a/core/includes/tablesort.inc b/core/includes/tablesort.inc.php similarity index 100% rename from core/includes/tablesort.inc rename to core/includes/tablesort.inc.php diff --git a/core/includes/theme.inc b/core/includes/theme.inc.php similarity index 100% rename from core/includes/theme.inc rename to core/includes/theme.inc.php diff --git a/core/includes/theme.maintenance.inc b/core/includes/theme.maintenance.inc.php similarity index 100% rename from core/includes/theme.maintenance.inc rename to core/includes/theme.maintenance.inc.php diff --git a/core/includes/token.inc b/core/includes/token.inc.php similarity index 100% rename from core/includes/token.inc rename to core/includes/token.inc.php diff --git a/core/includes/unicode.entities.inc b/core/includes/unicode.entities.inc.php similarity index 100% rename from core/includes/unicode.entities.inc rename to core/includes/unicode.entities.inc.php diff --git a/core/includes/unicode.inc b/core/includes/unicode.inc.php similarity index 100% rename from core/includes/unicode.inc rename to core/includes/unicode.inc.php diff --git a/core/includes/update.inc b/core/includes/update.inc.php similarity index 100% rename from core/includes/update.inc rename to core/includes/update.inc.php diff --git a/core/includes/updater.inc b/core/includes/updater.inc.php similarity index 100% rename from core/includes/updater.inc rename to core/includes/updater.inc.php diff --git a/core/includes/utility.inc b/core/includes/utility.inc.php similarity index 100% rename from core/includes/utility.inc rename to core/includes/utility.inc.php diff --git a/core/includes/uuid.inc b/core/includes/uuid.inc.php similarity index 100% rename from core/includes/uuid.inc rename to core/includes/uuid.inc.php diff --git a/core/includes/xmlrpc.inc b/core/includes/xmlrpc.inc.php similarity index 100% rename from core/includes/xmlrpc.inc rename to core/includes/xmlrpc.inc.php diff --git a/core/includes/xmlrpcs.inc b/core/includes/xmlrpcs.inc.php similarity index 100% rename from core/includes/xmlrpcs.inc rename to core/includes/xmlrpcs.inc.php diff --git a/core/modules/aggregator/aggregator.admin.inc b/core/modules/aggregator/aggregator.admin.inc.php similarity index 100% rename from core/modules/aggregator/aggregator.admin.inc rename to core/modules/aggregator/aggregator.admin.inc.php diff --git a/core/modules/aggregator/aggregator.fetcher.inc b/core/modules/aggregator/aggregator.fetcher.inc.php similarity index 100% rename from core/modules/aggregator/aggregator.fetcher.inc rename to core/modules/aggregator/aggregator.fetcher.inc.php diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module.php similarity index 100% rename from core/modules/aggregator/aggregator.module rename to core/modules/aggregator/aggregator.module.php diff --git a/core/modules/aggregator/aggregator.pages.inc b/core/modules/aggregator/aggregator.pages.inc.php similarity index 100% rename from core/modules/aggregator/aggregator.pages.inc rename to core/modules/aggregator/aggregator.pages.inc.php diff --git a/core/modules/aggregator/aggregator.parser.inc b/core/modules/aggregator/aggregator.parser.inc.php similarity index 100% rename from core/modules/aggregator/aggregator.parser.inc rename to core/modules/aggregator/aggregator.parser.inc.php diff --git a/core/modules/aggregator/aggregator.processor.inc b/core/modules/aggregator/aggregator.processor.inc.php similarity index 100% rename from core/modules/aggregator/aggregator.processor.inc rename to core/modules/aggregator/aggregator.processor.inc.php diff --git a/core/modules/aggregator/tests/aggregator_test.module b/core/modules/aggregator/tests/aggregator_test.module.php similarity index 100% rename from core/modules/aggregator/tests/aggregator_test.module rename to core/modules/aggregator/tests/aggregator_test.module.php diff --git a/core/modules/block/block.admin.inc b/core/modules/block/block.admin.inc.php similarity index 100% rename from core/modules/block/block.admin.inc rename to core/modules/block/block.admin.inc.php diff --git a/core/modules/block/block.module b/core/modules/block/block.module.php similarity index 100% rename from core/modules/block/block.module rename to core/modules/block/block.module.php diff --git a/core/modules/block/tests/block_test.module b/core/modules/block/tests/block_test.module.php similarity index 100% rename from core/modules/block/tests/block_test.module rename to core/modules/block/tests/block_test.module.php diff --git a/core/modules/book/book.admin.inc b/core/modules/book/book.admin.inc.php similarity index 100% rename from core/modules/book/book.admin.inc rename to core/modules/book/book.admin.inc.php diff --git a/core/modules/book/book.module b/core/modules/book/book.module.php similarity index 100% rename from core/modules/book/book.module rename to core/modules/book/book.module.php diff --git a/core/modules/book/book.pages.inc b/core/modules/book/book.pages.inc.php similarity index 100% rename from core/modules/book/book.pages.inc rename to core/modules/book/book.pages.inc.php diff --git a/core/modules/color/color.module b/core/modules/color/color.module.php similarity index 100% rename from core/modules/color/color.module rename to core/modules/color/color.module.php diff --git a/core/modules/comment/comment.admin.inc b/core/modules/comment/comment.admin.inc.php similarity index 100% rename from core/modules/comment/comment.admin.inc rename to core/modules/comment/comment.admin.inc.php diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module.php similarity index 100% rename from core/modules/comment/comment.module rename to core/modules/comment/comment.module.php diff --git a/core/modules/comment/comment.pages.inc b/core/modules/comment/comment.pages.inc.php similarity index 100% rename from core/modules/comment/comment.pages.inc rename to core/modules/comment/comment.pages.inc.php diff --git a/core/modules/comment/comment.tokens.inc b/core/modules/comment/comment.tokens.inc.php similarity index 100% rename from core/modules/comment/comment.tokens.inc rename to core/modules/comment/comment.tokens.inc.php diff --git a/core/modules/contact/contact.admin.inc b/core/modules/contact/contact.admin.inc.php similarity index 100% rename from core/modules/contact/contact.admin.inc rename to core/modules/contact/contact.admin.inc.php diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module.php similarity index 100% rename from core/modules/contact/contact.module rename to core/modules/contact/contact.module.php diff --git a/core/modules/contact/contact.pages.inc b/core/modules/contact/contact.pages.inc.php similarity index 100% rename from core/modules/contact/contact.pages.inc rename to core/modules/contact/contact.pages.inc.php diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module.php similarity index 100% rename from core/modules/contextual/contextual.module rename to core/modules/contextual/contextual.module.php diff --git a/core/modules/dashboard/dashboard.module b/core/modules/dashboard/dashboard.module.php similarity index 100% rename from core/modules/dashboard/dashboard.module rename to core/modules/dashboard/dashboard.module.php diff --git a/core/modules/dblog/dblog.admin.inc b/core/modules/dblog/dblog.admin.inc.php similarity index 100% rename from core/modules/dblog/dblog.admin.inc rename to core/modules/dblog/dblog.admin.inc.php diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module.php similarity index 100% rename from core/modules/dblog/dblog.module rename to core/modules/dblog/dblog.module.php diff --git a/core/modules/entity/entity.controller.inc b/core/modules/entity/entity.controller.inc.php similarity index 100% rename from core/modules/entity/entity.controller.inc rename to core/modules/entity/entity.controller.inc.php diff --git a/core/modules/entity/entity.module b/core/modules/entity/entity.module.php similarity index 100% rename from core/modules/entity/entity.module rename to core/modules/entity/entity.module.php diff --git a/core/modules/entity/entity.query.inc b/core/modules/entity/entity.query.inc.php similarity index 100% rename from core/modules/entity/entity.query.inc rename to core/modules/entity/entity.query.inc.php diff --git a/core/modules/entity/tests/entity_cache_test.module b/core/modules/entity/tests/entity_cache_test.module.php similarity index 100% rename from core/modules/entity/tests/entity_cache_test.module rename to core/modules/entity/tests/entity_cache_test.module.php diff --git a/core/modules/entity/tests/entity_cache_test_dependency.module b/core/modules/entity/tests/entity_cache_test_dependency.module.php similarity index 100% rename from core/modules/entity/tests/entity_cache_test_dependency.module rename to core/modules/entity/tests/entity_cache_test_dependency.module.php diff --git a/core/modules/entity/tests/entity_crud_hook_test.module b/core/modules/entity/tests/entity_crud_hook_test.module.php similarity index 100% rename from core/modules/entity/tests/entity_crud_hook_test.module rename to core/modules/entity/tests/entity_crud_hook_test.module.php diff --git a/core/modules/field/field.attach.inc b/core/modules/field/field.attach.inc.php similarity index 100% rename from core/modules/field/field.attach.inc rename to core/modules/field/field.attach.inc.php diff --git a/core/modules/field/field.crud.inc b/core/modules/field/field.crud.inc.php similarity index 100% rename from core/modules/field/field.crud.inc rename to core/modules/field/field.crud.inc.php diff --git a/core/modules/field/field.default.inc b/core/modules/field/field.default.inc.php similarity index 100% rename from core/modules/field/field.default.inc rename to core/modules/field/field.default.inc.php diff --git a/core/modules/field/field.form.inc b/core/modules/field/field.form.inc.php similarity index 100% rename from core/modules/field/field.form.inc rename to core/modules/field/field.form.inc.php diff --git a/core/modules/field/field.info.inc b/core/modules/field/field.info.inc.php similarity index 100% rename from core/modules/field/field.info.inc rename to core/modules/field/field.info.inc.php diff --git a/core/modules/field/field.module b/core/modules/field/field.module.php similarity index 100% rename from core/modules/field/field.module rename to core/modules/field/field.module.php diff --git a/core/modules/field/field.multilingual.inc b/core/modules/field/field.multilingual.inc.php similarity index 100% rename from core/modules/field/field.multilingual.inc rename to core/modules/field/field.multilingual.inc.php diff --git a/core/modules/field/modules/field_sql_storage/field_sql_storage.module b/core/modules/field/modules/field_sql_storage/field_sql_storage.module.php similarity index 100% rename from core/modules/field/modules/field_sql_storage/field_sql_storage.module rename to core/modules/field/modules/field_sql_storage/field_sql_storage.module.php diff --git a/core/modules/field/modules/list/list.module b/core/modules/field/modules/list/list.module.php similarity index 100% rename from core/modules/field/modules/list/list.module rename to core/modules/field/modules/list/list.module.php diff --git a/core/modules/field/modules/list/tests/list_test.module b/core/modules/field/modules/list/tests/list_test.module.php similarity index 100% rename from core/modules/field/modules/list/tests/list_test.module rename to core/modules/field/modules/list/tests/list_test.module.php diff --git a/core/modules/field/modules/number/number.module b/core/modules/field/modules/number/number.module.php similarity index 100% rename from core/modules/field/modules/number/number.module rename to core/modules/field/modules/number/number.module.php diff --git a/core/modules/field/modules/options/options.module b/core/modules/field/modules/options/options.module.php similarity index 100% rename from core/modules/field/modules/options/options.module rename to core/modules/field/modules/options/options.module.php diff --git a/core/modules/field/modules/text/text.module b/core/modules/field/modules/text/text.module.php similarity index 100% rename from core/modules/field/modules/text/text.module rename to core/modules/field/modules/text/text.module.php diff --git a/core/modules/field/tests/field_test.entity.inc b/core/modules/field/tests/field_test.entity.inc.php similarity index 100% rename from core/modules/field/tests/field_test.entity.inc rename to core/modules/field/tests/field_test.entity.inc.php diff --git a/core/modules/field/tests/field_test.field.inc b/core/modules/field/tests/field_test.field.inc.php similarity index 100% rename from core/modules/field/tests/field_test.field.inc rename to core/modules/field/tests/field_test.field.inc.php diff --git a/core/modules/field/tests/field_test.module b/core/modules/field/tests/field_test.module.php similarity index 100% rename from core/modules/field/tests/field_test.module rename to core/modules/field/tests/field_test.module.php diff --git a/core/modules/field/tests/field_test.storage.inc b/core/modules/field/tests/field_test.storage.inc.php similarity index 100% rename from core/modules/field/tests/field_test.storage.inc rename to core/modules/field/tests/field_test.storage.inc.php diff --git a/core/modules/field_ui/field_ui.admin.inc b/core/modules/field_ui/field_ui.admin.inc.php similarity index 100% rename from core/modules/field_ui/field_ui.admin.inc rename to core/modules/field_ui/field_ui.admin.inc.php diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module.php similarity index 100% rename from core/modules/field_ui/field_ui.module rename to core/modules/field_ui/field_ui.module.php diff --git a/core/modules/file/file.field.inc b/core/modules/file/file.field.inc.php similarity index 100% rename from core/modules/file/file.field.inc rename to core/modules/file/file.field.inc.php diff --git a/core/modules/file/file.module b/core/modules/file/file.module.php similarity index 100% rename from core/modules/file/file.module rename to core/modules/file/file.module.php diff --git a/core/modules/file/tests/file_module_test.module b/core/modules/file/tests/file_module_test.module.php similarity index 100% rename from core/modules/file/tests/file_module_test.module rename to core/modules/file/tests/file_module_test.module.php diff --git a/core/modules/filter/filter.admin.inc b/core/modules/filter/filter.admin.inc.php similarity index 100% rename from core/modules/filter/filter.admin.inc rename to core/modules/filter/filter.admin.inc.php diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module.php similarity index 100% rename from core/modules/filter/filter.module rename to core/modules/filter/filter.module.php diff --git a/core/modules/filter/filter.pages.inc b/core/modules/filter/filter.pages.inc.php similarity index 100% rename from core/modules/filter/filter.pages.inc rename to core/modules/filter/filter.pages.inc.php diff --git a/core/modules/forum/forum.admin.inc b/core/modules/forum/forum.admin.inc.php similarity index 100% rename from core/modules/forum/forum.admin.inc rename to core/modules/forum/forum.admin.inc.php diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module.php similarity index 100% rename from core/modules/forum/forum.module rename to core/modules/forum/forum.module.php diff --git a/core/modules/forum/forum.pages.inc b/core/modules/forum/forum.pages.inc.php similarity index 100% rename from core/modules/forum/forum.pages.inc rename to core/modules/forum/forum.pages.inc.php diff --git a/core/modules/help/help.admin.inc b/core/modules/help/help.admin.inc.php similarity index 100% rename from core/modules/help/help.admin.inc rename to core/modules/help/help.admin.inc.php diff --git a/core/modules/help/help.module b/core/modules/help/help.module.php similarity index 100% rename from core/modules/help/help.module rename to core/modules/help/help.module.php diff --git a/core/modules/image/image.admin.inc b/core/modules/image/image.admin.inc.php similarity index 100% rename from core/modules/image/image.admin.inc rename to core/modules/image/image.admin.inc.php diff --git a/core/modules/image/image.effects.inc b/core/modules/image/image.effects.inc.php similarity index 100% rename from core/modules/image/image.effects.inc rename to core/modules/image/image.effects.inc.php diff --git a/core/modules/image/image.field.inc b/core/modules/image/image.field.inc.php similarity index 100% rename from core/modules/image/image.field.inc rename to core/modules/image/image.field.inc.php diff --git a/core/modules/image/image.module b/core/modules/image/image.module.php similarity index 100% rename from core/modules/image/image.module rename to core/modules/image/image.module.php diff --git a/core/modules/image/tests/image_module_test.module b/core/modules/image/tests/image_module_test.module.php similarity index 100% rename from core/modules/image/tests/image_module_test.module rename to core/modules/image/tests/image_module_test.module.php diff --git a/core/modules/locale/locale.admin.inc b/core/modules/locale/locale.admin.inc.php similarity index 100% rename from core/modules/locale/locale.admin.inc rename to core/modules/locale/locale.admin.inc.php diff --git a/core/modules/locale/locale.bulk.inc b/core/modules/locale/locale.bulk.inc.php similarity index 100% rename from core/modules/locale/locale.bulk.inc rename to core/modules/locale/locale.bulk.inc.php diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module.php similarity index 100% rename from core/modules/locale/locale.module rename to core/modules/locale/locale.module.php diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc.php similarity index 100% rename from core/modules/locale/locale.pages.inc rename to core/modules/locale/locale.pages.inc.php diff --git a/core/modules/locale/tests/locale_test.module b/core/modules/locale/tests/locale_test.module.php similarity index 100% rename from core/modules/locale/tests/locale_test.module rename to core/modules/locale/tests/locale_test.module.php diff --git a/core/modules/menu/menu.admin.inc b/core/modules/menu/menu.admin.inc.php similarity index 100% rename from core/modules/menu/menu.admin.inc rename to core/modules/menu/menu.admin.inc.php diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module.php similarity index 100% rename from core/modules/menu/menu.module rename to core/modules/menu/menu.module.php diff --git a/core/modules/node/content_types.inc b/core/modules/node/content_types.inc.php similarity index 100% rename from core/modules/node/content_types.inc rename to core/modules/node/content_types.inc.php diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc.php similarity index 100% rename from core/modules/node/node.admin.inc rename to core/modules/node/node.admin.inc.php diff --git a/core/modules/node/node.module b/core/modules/node/node.module.php similarity index 100% rename from core/modules/node/node.module rename to core/modules/node/node.module.php diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc.php similarity index 100% rename from core/modules/node/node.pages.inc rename to core/modules/node/node.pages.inc.php diff --git a/core/modules/node/node.tokens.inc b/core/modules/node/node.tokens.inc.php similarity index 100% rename from core/modules/node/node.tokens.inc rename to core/modules/node/node.tokens.inc.php diff --git a/core/modules/node/tests/node_access_test.module b/core/modules/node/tests/node_access_test.module.php similarity index 100% rename from core/modules/node/tests/node_access_test.module rename to core/modules/node/tests/node_access_test.module.php diff --git a/core/modules/node/tests/node_test.module b/core/modules/node/tests/node_test.module.php similarity index 100% rename from core/modules/node/tests/node_test.module rename to core/modules/node/tests/node_test.module.php diff --git a/core/modules/node/tests/node_test_exception.module b/core/modules/node/tests/node_test_exception.module.php similarity index 100% rename from core/modules/node/tests/node_test_exception.module rename to core/modules/node/tests/node_test_exception.module.php diff --git a/core/modules/openid/openid.inc b/core/modules/openid/openid.inc.php similarity index 100% rename from core/modules/openid/openid.inc rename to core/modules/openid/openid.inc.php diff --git a/core/modules/openid/openid.module b/core/modules/openid/openid.module.php similarity index 100% rename from core/modules/openid/openid.module rename to core/modules/openid/openid.module.php diff --git a/core/modules/openid/openid.pages.inc b/core/modules/openid/openid.pages.inc.php similarity index 100% rename from core/modules/openid/openid.pages.inc rename to core/modules/openid/openid.pages.inc.php diff --git a/core/modules/openid/tests/openid_test.module b/core/modules/openid/tests/openid_test.module.php similarity index 100% rename from core/modules/openid/tests/openid_test.module rename to core/modules/openid/tests/openid_test.module.php diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module.php similarity index 100% rename from core/modules/overlay/overlay.module rename to core/modules/overlay/overlay.module.php diff --git a/core/modules/path/path.admin.inc b/core/modules/path/path.admin.inc.php similarity index 100% rename from core/modules/path/path.admin.inc rename to core/modules/path/path.admin.inc.php diff --git a/core/modules/path/path.module b/core/modules/path/path.module.php similarity index 100% rename from core/modules/path/path.module rename to core/modules/path/path.module.php diff --git a/core/modules/php/php.module b/core/modules/php/php.module.php similarity index 100% rename from core/modules/php/php.module rename to core/modules/php/php.module.php diff --git a/core/modules/poll/poll.module b/core/modules/poll/poll.module.php similarity index 100% rename from core/modules/poll/poll.module rename to core/modules/poll/poll.module.php diff --git a/core/modules/poll/poll.pages.inc b/core/modules/poll/poll.pages.inc.php similarity index 100% rename from core/modules/poll/poll.pages.inc rename to core/modules/poll/poll.pages.inc.php diff --git a/core/modules/poll/poll.tokens.inc b/core/modules/poll/poll.tokens.inc.php similarity index 100% rename from core/modules/poll/poll.tokens.inc rename to core/modules/poll/poll.tokens.inc.php diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module.php similarity index 100% rename from core/modules/rdf/rdf.module rename to core/modules/rdf/rdf.module.php diff --git a/core/modules/rdf/tests/rdf_test.module b/core/modules/rdf/tests/rdf_test.module.php similarity index 100% rename from core/modules/rdf/tests/rdf_test.module rename to core/modules/rdf/tests/rdf_test.module.php diff --git a/core/modules/search/search.admin.inc b/core/modules/search/search.admin.inc.php similarity index 100% rename from core/modules/search/search.admin.inc rename to core/modules/search/search.admin.inc.php diff --git a/core/modules/search/search.extender.inc b/core/modules/search/search.extender.inc.php similarity index 100% rename from core/modules/search/search.extender.inc rename to core/modules/search/search.extender.inc.php diff --git a/core/modules/search/search.module b/core/modules/search/search.module.php similarity index 100% rename from core/modules/search/search.module rename to core/modules/search/search.module.php diff --git a/core/modules/search/search.pages.inc b/core/modules/search/search.pages.inc.php similarity index 100% rename from core/modules/search/search.pages.inc rename to core/modules/search/search.pages.inc.php diff --git a/core/modules/search/tests/search_embedded_form.module b/core/modules/search/tests/search_embedded_form.module.php similarity index 100% rename from core/modules/search/tests/search_embedded_form.module rename to core/modules/search/tests/search_embedded_form.module.php diff --git a/core/modules/search/tests/search_extra_type.module b/core/modules/search/tests/search_extra_type.module.php similarity index 100% rename from core/modules/search/tests/search_extra_type.module rename to core/modules/search/tests/search_extra_type.module.php diff --git a/core/modules/shortcut/shortcut.admin.inc b/core/modules/shortcut/shortcut.admin.inc.php similarity index 100% rename from core/modules/shortcut/shortcut.admin.inc rename to core/modules/shortcut/shortcut.admin.inc.php diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module.php similarity index 100% rename from core/modules/shortcut/shortcut.module rename to core/modules/shortcut/shortcut.module.php diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module.php similarity index 100% rename from core/modules/simpletest/simpletest.module rename to core/modules/simpletest/simpletest.module.php diff --git a/core/modules/simpletest/simpletest.pages.inc b/core/modules/simpletest/simpletest.pages.inc.php similarity index 100% rename from core/modules/simpletest/simpletest.pages.inc rename to core/modules/simpletest/simpletest.pages.inc.php diff --git a/core/modules/simpletest/tests/actions_loop_test.module b/core/modules/simpletest/tests/actions_loop_test.module.php similarity index 100% rename from core/modules/simpletest/tests/actions_loop_test.module rename to core/modules/simpletest/tests/actions_loop_test.module.php diff --git a/core/modules/simpletest/tests/ajax_forms_test.module b/core/modules/simpletest/tests/ajax_forms_test.module.php similarity index 100% rename from core/modules/simpletest/tests/ajax_forms_test.module rename to core/modules/simpletest/tests/ajax_forms_test.module.php diff --git a/core/modules/simpletest/tests/ajax_test.module b/core/modules/simpletest/tests/ajax_test.module.php similarity index 100% rename from core/modules/simpletest/tests/ajax_test.module rename to core/modules/simpletest/tests/ajax_test.module.php diff --git a/core/modules/simpletest/tests/batch_test.callbacks.inc b/core/modules/simpletest/tests/batch_test.callbacks.inc.php similarity index 100% rename from core/modules/simpletest/tests/batch_test.callbacks.inc rename to core/modules/simpletest/tests/batch_test.callbacks.inc.php diff --git a/core/modules/simpletest/tests/batch_test.module b/core/modules/simpletest/tests/batch_test.module.php similarity index 100% rename from core/modules/simpletest/tests/batch_test.module rename to core/modules/simpletest/tests/batch_test.module.php diff --git a/core/modules/simpletest/tests/common_test.module b/core/modules/simpletest/tests/common_test.module.php similarity index 100% rename from core/modules/simpletest/tests/common_test.module rename to core/modules/simpletest/tests/common_test.module.php diff --git a/core/modules/simpletest/tests/common_test_cron_helper.module b/core/modules/simpletest/tests/common_test_cron_helper.module.php similarity index 100% rename from core/modules/simpletest/tests/common_test_cron_helper.module rename to core/modules/simpletest/tests/common_test_cron_helper.module.php diff --git a/core/modules/simpletest/tests/database_test.module b/core/modules/simpletest/tests/database_test.module.php similarity index 100% rename from core/modules/simpletest/tests/database_test.module rename to core/modules/simpletest/tests/database_test.module.php diff --git a/core/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.php similarity index 100% rename from core/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.php diff --git a/core/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.php similarity index 100% rename from core/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.php diff --git a/core/modules/simpletest/tests/error_test.module b/core/modules/simpletest/tests/error_test.module.php similarity index 100% rename from core/modules/simpletest/tests/error_test.module rename to core/modules/simpletest/tests/error_test.module.php diff --git a/core/modules/simpletest/tests/file_test.module b/core/modules/simpletest/tests/file_test.module.php similarity index 100% rename from core/modules/simpletest/tests/file_test.module rename to core/modules/simpletest/tests/file_test.module.php diff --git a/core/modules/simpletest/tests/filter_test.module b/core/modules/simpletest/tests/filter_test.module.php similarity index 100% rename from core/modules/simpletest/tests/filter_test.module rename to core/modules/simpletest/tests/filter_test.module.php diff --git a/core/modules/simpletest/tests/form_test.file.inc b/core/modules/simpletest/tests/form_test.file.inc.php similarity index 100% rename from core/modules/simpletest/tests/form_test.file.inc rename to core/modules/simpletest/tests/form_test.file.inc.php diff --git a/core/modules/simpletest/tests/form_test.module b/core/modules/simpletest/tests/form_test.module.php similarity index 100% rename from core/modules/simpletest/tests/form_test.module rename to core/modules/simpletest/tests/form_test.module.php diff --git a/core/modules/simpletest/tests/image_test.module b/core/modules/simpletest/tests/image_test.module.php similarity index 100% rename from core/modules/simpletest/tests/image_test.module rename to core/modules/simpletest/tests/image_test.module.php diff --git a/core/modules/simpletest/tests/menu_test.module b/core/modules/simpletest/tests/menu_test.module.php similarity index 100% rename from core/modules/simpletest/tests/menu_test.module rename to core/modules/simpletest/tests/menu_test.module.php diff --git a/core/modules/simpletest/tests/module_test.file.inc b/core/modules/simpletest/tests/module_test.file.inc.php similarity index 100% rename from core/modules/simpletest/tests/module_test.file.inc rename to core/modules/simpletest/tests/module_test.file.inc.php diff --git a/core/modules/simpletest/tests/module_test.module b/core/modules/simpletest/tests/module_test.module.php similarity index 100% rename from core/modules/simpletest/tests/module_test.module rename to core/modules/simpletest/tests/module_test.module.php diff --git a/core/modules/simpletest/tests/requirements1_test.module b/core/modules/simpletest/tests/requirements1_test.module.php similarity index 100% rename from core/modules/simpletest/tests/requirements1_test.module rename to core/modules/simpletest/tests/requirements1_test.module.php diff --git a/core/modules/simpletest/tests/requirements2_test.module b/core/modules/simpletest/tests/requirements2_test.module.php similarity index 100% rename from core/modules/simpletest/tests/requirements2_test.module rename to core/modules/simpletest/tests/requirements2_test.module.php diff --git a/core/modules/simpletest/tests/session_test.module b/core/modules/simpletest/tests/session_test.module.php similarity index 100% rename from core/modules/simpletest/tests/session_test.module rename to core/modules/simpletest/tests/session_test.module.php diff --git a/core/modules/simpletest/tests/system_dependencies_test.module b/core/modules/simpletest/tests/system_dependencies_test.module.php similarity index 100% rename from core/modules/simpletest/tests/system_dependencies_test.module rename to core/modules/simpletest/tests/system_dependencies_test.module.php diff --git a/core/modules/simpletest/tests/system_test.module b/core/modules/simpletest/tests/system_test.module.php similarity index 100% rename from core/modules/simpletest/tests/system_test.module rename to core/modules/simpletest/tests/system_test.module.php diff --git a/core/modules/simpletest/tests/taxonomy_test.module b/core/modules/simpletest/tests/taxonomy_test.module.php similarity index 100% rename from core/modules/simpletest/tests/taxonomy_test.module rename to core/modules/simpletest/tests/taxonomy_test.module.php diff --git a/core/modules/simpletest/tests/theme_test.module b/core/modules/simpletest/tests/theme_test.module.php similarity index 100% rename from core/modules/simpletest/tests/theme_test.module rename to core/modules/simpletest/tests/theme_test.module.php diff --git a/core/modules/simpletest/tests/update_script_test.module b/core/modules/simpletest/tests/update_script_test.module.php similarity index 100% rename from core/modules/simpletest/tests/update_script_test.module rename to core/modules/simpletest/tests/update_script_test.module.php diff --git a/core/modules/simpletest/tests/update_test_1.module b/core/modules/simpletest/tests/update_test_1.module.php similarity index 100% rename from core/modules/simpletest/tests/update_test_1.module rename to core/modules/simpletest/tests/update_test_1.module.php diff --git a/core/modules/simpletest/tests/update_test_2.module b/core/modules/simpletest/tests/update_test_2.module.php similarity index 100% rename from core/modules/simpletest/tests/update_test_2.module rename to core/modules/simpletest/tests/update_test_2.module.php diff --git a/core/modules/simpletest/tests/update_test_3.module b/core/modules/simpletest/tests/update_test_3.module.php similarity index 100% rename from core/modules/simpletest/tests/update_test_3.module rename to core/modules/simpletest/tests/update_test_3.module.php diff --git a/core/modules/simpletest/tests/url_alter_test.module b/core/modules/simpletest/tests/url_alter_test.module.php similarity index 100% rename from core/modules/simpletest/tests/url_alter_test.module rename to core/modules/simpletest/tests/url_alter_test.module.php diff --git a/core/modules/simpletest/tests/xmlrpc_test.module b/core/modules/simpletest/tests/xmlrpc_test.module.php similarity index 100% rename from core/modules/simpletest/tests/xmlrpc_test.module rename to core/modules/simpletest/tests/xmlrpc_test.module.php diff --git a/core/modules/statistics/statistics.admin.inc b/core/modules/statistics/statistics.admin.inc.php similarity index 100% rename from core/modules/statistics/statistics.admin.inc rename to core/modules/statistics/statistics.admin.inc.php diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module.php similarity index 100% rename from core/modules/statistics/statistics.module rename to core/modules/statistics/statistics.module.php diff --git a/core/modules/statistics/statistics.pages.inc b/core/modules/statistics/statistics.pages.inc.php similarity index 100% rename from core/modules/statistics/statistics.pages.inc rename to core/modules/statistics/statistics.pages.inc.php diff --git a/core/modules/statistics/statistics.tokens.inc b/core/modules/statistics/statistics.tokens.inc.php similarity index 100% rename from core/modules/statistics/statistics.tokens.inc rename to core/modules/statistics/statistics.tokens.inc.php diff --git a/core/modules/syslog/syslog.module b/core/modules/syslog/syslog.module.php similarity index 100% rename from core/modules/syslog/syslog.module rename to core/modules/syslog/syslog.module.php diff --git a/core/modules/system/image.gd.inc b/core/modules/system/image.gd.inc.php similarity index 100% rename from core/modules/system/image.gd.inc rename to core/modules/system/image.gd.inc.php diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc.php similarity index 100% rename from core/modules/system/system.admin.inc rename to core/modules/system/system.admin.inc.php diff --git a/core/modules/system/system.archiver.inc b/core/modules/system/system.archiver.inc.php similarity index 100% rename from core/modules/system/system.archiver.inc rename to core/modules/system/system.archiver.inc.php diff --git a/core/modules/system/system.mail.inc b/core/modules/system/system.mail.inc.php similarity index 100% rename from core/modules/system/system.mail.inc rename to core/modules/system/system.mail.inc.php diff --git a/core/modules/system/system.module b/core/modules/system/system.module.php similarity index 100% rename from core/modules/system/system.module rename to core/modules/system/system.module.php diff --git a/core/modules/system/system.queue.inc b/core/modules/system/system.queue.inc.php similarity index 100% rename from core/modules/system/system.queue.inc rename to core/modules/system/system.queue.inc.php diff --git a/core/modules/system/system.tar.inc b/core/modules/system/system.tar.inc.php similarity index 100% rename from core/modules/system/system.tar.inc rename to core/modules/system/system.tar.inc.php diff --git a/core/modules/system/system.tokens.inc b/core/modules/system/system.tokens.inc.php similarity index 100% rename from core/modules/system/system.tokens.inc rename to core/modules/system/system.tokens.inc.php diff --git a/core/modules/system/system.updater.inc b/core/modules/system/system.updater.inc.php similarity index 100% rename from core/modules/system/system.updater.inc rename to core/modules/system/system.updater.inc.php diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc.php similarity index 100% rename from core/modules/taxonomy/taxonomy.admin.inc rename to core/modules/taxonomy/taxonomy.admin.inc.php diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module.php similarity index 100% rename from core/modules/taxonomy/taxonomy.module rename to core/modules/taxonomy/taxonomy.module.php diff --git a/core/modules/taxonomy/taxonomy.pages.inc b/core/modules/taxonomy/taxonomy.pages.inc.php similarity index 100% rename from core/modules/taxonomy/taxonomy.pages.inc rename to core/modules/taxonomy/taxonomy.pages.inc.php diff --git a/core/modules/taxonomy/taxonomy.tokens.inc b/core/modules/taxonomy/taxonomy.tokens.inc.php similarity index 100% rename from core/modules/taxonomy/taxonomy.tokens.inc rename to core/modules/taxonomy/taxonomy.tokens.inc.php diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module.php similarity index 100% rename from core/modules/toolbar/toolbar.module rename to core/modules/toolbar/toolbar.module.php diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module.php similarity index 100% rename from core/modules/tracker/tracker.module rename to core/modules/tracker/tracker.module.php diff --git a/core/modules/tracker/tracker.pages.inc b/core/modules/tracker/tracker.pages.inc.php similarity index 100% rename from core/modules/tracker/tracker.pages.inc rename to core/modules/tracker/tracker.pages.inc.php diff --git a/core/modules/translation/tests/translation_test.module b/core/modules/translation/tests/translation_test.module.php similarity index 100% rename from core/modules/translation/tests/translation_test.module rename to core/modules/translation/tests/translation_test.module.php diff --git a/core/modules/translation/translation.module b/core/modules/translation/translation.module.php similarity index 100% rename from core/modules/translation/translation.module rename to core/modules/translation/translation.module.php diff --git a/core/modules/translation/translation.pages.inc b/core/modules/translation/translation.pages.inc.php similarity index 100% rename from core/modules/translation/translation.pages.inc rename to core/modules/translation/translation.pages.inc.php diff --git a/core/modules/trigger/tests/trigger_test.module b/core/modules/trigger/tests/trigger_test.module.php similarity index 100% rename from core/modules/trigger/tests/trigger_test.module rename to core/modules/trigger/tests/trigger_test.module.php diff --git a/core/modules/trigger/trigger.admin.inc b/core/modules/trigger/trigger.admin.inc.php similarity index 100% rename from core/modules/trigger/trigger.admin.inc rename to core/modules/trigger/trigger.admin.inc.php diff --git a/core/modules/trigger/trigger.module b/core/modules/trigger/trigger.module.php similarity index 100% rename from core/modules/trigger/trigger.module rename to core/modules/trigger/trigger.module.php diff --git a/core/modules/update/tests/aaa_update_test.module b/core/modules/update/tests/aaa_update_test.module.php similarity index 100% rename from core/modules/update/tests/aaa_update_test.module rename to core/modules/update/tests/aaa_update_test.module.php diff --git a/core/modules/update/tests/bbb_update_test.module b/core/modules/update/tests/bbb_update_test.module.php similarity index 100% rename from core/modules/update/tests/bbb_update_test.module rename to core/modules/update/tests/bbb_update_test.module.php diff --git a/core/modules/update/tests/ccc_update_test.module b/core/modules/update/tests/ccc_update_test.module.php similarity index 100% rename from core/modules/update/tests/ccc_update_test.module rename to core/modules/update/tests/ccc_update_test.module.php diff --git a/core/modules/update/tests/update_test.module b/core/modules/update/tests/update_test.module.php similarity index 100% rename from core/modules/update/tests/update_test.module rename to core/modules/update/tests/update_test.module.php diff --git a/core/modules/update/update.authorize.inc b/core/modules/update/update.authorize.inc.php similarity index 100% rename from core/modules/update/update.authorize.inc rename to core/modules/update/update.authorize.inc.php diff --git a/core/modules/update/update.compare.inc b/core/modules/update/update.compare.inc.php similarity index 100% rename from core/modules/update/update.compare.inc rename to core/modules/update/update.compare.inc.php diff --git a/core/modules/update/update.fetch.inc b/core/modules/update/update.fetch.inc.php similarity index 100% rename from core/modules/update/update.fetch.inc rename to core/modules/update/update.fetch.inc.php diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc.php similarity index 100% rename from core/modules/update/update.manager.inc rename to core/modules/update/update.manager.inc.php diff --git a/core/modules/update/update.module b/core/modules/update/update.module.php similarity index 100% rename from core/modules/update/update.module rename to core/modules/update/update.module.php diff --git a/core/modules/update/update.report.inc b/core/modules/update/update.report.inc.php similarity index 100% rename from core/modules/update/update.report.inc rename to core/modules/update/update.report.inc.php diff --git a/core/modules/update/update.settings.inc b/core/modules/update/update.settings.inc.php similarity index 100% rename from core/modules/update/update.settings.inc rename to core/modules/update/update.settings.inc.php diff --git a/core/modules/user/tests/user_form_test.module b/core/modules/user/tests/user_form_test.module.php similarity index 100% rename from core/modules/user/tests/user_form_test.module rename to core/modules/user/tests/user_form_test.module.php diff --git a/core/modules/user/user.admin.inc b/core/modules/user/user.admin.inc.php similarity index 100% rename from core/modules/user/user.admin.inc rename to core/modules/user/user.admin.inc.php diff --git a/core/modules/user/user.entity.inc b/core/modules/user/user.entity.inc.php similarity index 100% rename from core/modules/user/user.entity.inc rename to core/modules/user/user.entity.inc.php diff --git a/core/modules/user/user.module b/core/modules/user/user.module.php similarity index 100% rename from core/modules/user/user.module rename to core/modules/user/user.module.php diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc.php similarity index 100% rename from core/modules/user/user.pages.inc rename to core/modules/user/user.pages.inc.php diff --git a/core/modules/user/user.tokens.inc b/core/modules/user/user.tokens.inc.php similarity index 100% rename from core/modules/user/user.tokens.inc rename to core/modules/user/user.tokens.inc.php diff --git a/core/themes/bartik/color/color.inc b/core/themes/bartik/color/color.inc.php similarity index 100% rename from core/themes/bartik/color/color.inc rename to core/themes/bartik/color/color.inc.php diff --git a/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module b/profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module.php similarity index 100% rename from profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module rename to profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module.php diff --git a/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.module b/profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.module.php similarity index 100% rename from profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.module rename to profiles/testing/modules/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.module.php -- 1.7.7 From 16ae7c54ee817adc784fb09837c15c2a6ad186c1 Mon Sep 17 00:00:00 2001 From: Marco Villegas Date: Thu, 3 Nov 2011 06:34:51 -0500 Subject: [PATCH 2/2] Issue #7269 by marvil07: Adecuate code after renaming to add php extension. --- core/authorize.php | 22 ++-- core/cron.php | 2 +- core/includes/bootstrap.inc.php | 35 +++--- core/includes/common.inc.php | 34 +++--- core/includes/database/database.inc.php | 2 +- core/includes/database/schema.inc.php | 2 +- core/includes/database/sqlite/database.inc.php | 2 +- core/includes/errors.inc.php | 2 +- core/includes/file.inc.php | 2 +- core/includes/form.inc.php | 8 +- core/includes/install.core.inc.php | 46 +++--- core/includes/install.inc.php | 16 +- core/includes/locale.inc.php | 6 +- core/includes/module.inc.php | 16 +- core/includes/registry.inc.php | 8 +- core/includes/session.inc.php | 2 +- core/includes/stream_wrappers.inc.php | 2 +- core/includes/theme.maintenance.inc.php | 16 +- core/includes/update.inc.php | 10 +- core/install.php | 2 +- core/modules/aggregator/aggregator.module.php | 56 ++++---- core/modules/block/block.module.php | 16 +- core/modules/book/book.module.php | 14 +- core/modules/comment/comment.module.php | 8 +- core/modules/contact/contact.module.php | 12 +- core/modules/dashboard/dashboard.module.php | 4 +- core/modules/dblog/dblog.module.php | 12 +- core/modules/field/field.module.php | 14 +- core/modules/field/tests/field.test | 2 +- core/modules/field/tests/field_test.module.php | 6 +- core/modules/field_ui/field_ui.module.php | 18 ++-- core/modules/file/file.module.php | 2 +- core/modules/filter/filter.module.php | 16 +- core/modules/forum/forum.admin.inc.php | 2 +- core/modules/forum/forum.module.php | 18 ++-- core/modules/help/help.module.php | 4 +- core/modules/image/image.module.php | 26 ++-- core/modules/image/image.test | 2 +- core/modules/locale/locale.admin.inc.php | 6 +- core/modules/locale/locale.bulk.inc.php | 6 +- core/modules/locale/locale.install | 2 +- core/modules/locale/locale.module.php | 52 ++++---- core/modules/locale/locale.test | 18 ++-- core/modules/menu/menu.module.php | 24 ++-- core/modules/node/node.admin.inc.php | 2 +- core/modules/node/node.module.php | 34 +++--- core/modules/openid/openid.module.php | 22 ++-- core/modules/openid/openid.test | 2 +- core/modules/openid/tests/openid_test.install | 2 +- core/modules/openid/tests/openid_test.module.php | 4 +- core/modules/path/path.module.php | 8 +- core/modules/poll/poll.module.php | 6 +- core/modules/search/search.module.php | 14 +- core/modules/shortcut/shortcut.module.php | 22 ++-- core/modules/simpletest/drupal_web_test_case.php | 4 +- core/modules/simpletest/simpletest.module.php | 10 +- core/modules/simpletest/tests/batch.test | 2 +- .../modules/simpletest/tests/batch_test.module.php | 12 +- core/modules/simpletest/tests/bootstrap.test | 2 +- core/modules/simpletest/tests/error.test | 10 +- core/modules/simpletest/tests/form_test.module.php | 4 +- core/modules/simpletest/tests/graph.test | 2 +- core/modules/simpletest/tests/https.php | 2 +- core/modules/simpletest/tests/module.test | 2 +- core/modules/simpletest/tests/password.test | 2 +- core/modules/simpletest/tests/update.test | 4 +- core/modules/simpletest/tests/upgrade/upgrade.test | 2 +- core/modules/statistics/statistics.module.php | 18 ++-- core/modules/system/system.admin.inc.php | 14 +- core/modules/system/system.api.php | 8 +- core/modules/system/system.install | 2 +- core/modules/system/system.module.php | 142 ++++++++++---------- core/modules/system/system.test | 2 +- core/modules/system/system.updater.inc.php | 4 +- core/modules/taxonomy/taxonomy.module.php | 18 ++-- core/modules/taxonomy/taxonomy.test | 2 +- core/modules/tracker/tracker.module.php | 6 +- core/modules/translation/translation.module.php | 2 +- core/modules/translation/translation.pages.inc.php | 2 +- core/modules/trigger/trigger.module.php | 8 +- core/modules/update/update.authorize.inc.php | 4 +- core/modules/update/update.fetch.inc.php | 4 +- core/modules/update/update.install | 2 +- core/modules/update/update.manager.inc.php | 8 +- core/modules/update/update.module.php | 28 ++-- core/modules/update/update.report.inc.php | 2 +- core/modules/user/user.admin.inc.php | 2 +- core/modules/user/user.api.php | 4 +- core/modules/user/user.module.php | 48 ++++---- core/modules/user/user.test | 4 +- core/scripts/generate-d6-content.sh | 2 +- core/scripts/generate-d7-content.sh | 2 +- core/scripts/password-hash.sh | 4 +- core/scripts/run-tests.sh | 2 +- core/update.php | 22 ++-- core/xmlrpc.php | 6 +- index.php | 2 +- 97 files changed, 563 insertions(+), 560 deletions(-) diff --git a/core/authorize.php b/core/authorize.php index 26d310d..bd516bf 100644 --- a/core/authorize.php +++ b/core/authorize.php @@ -62,12 +62,12 @@ function authorize_access_allowed() { // *** Real work of the script begins here. *** -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'; +require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc.php'; +require_once DRUPAL_ROOT . '/core/includes/session.inc.php'; +require_once DRUPAL_ROOT . '/core/includes/common.inc.php'; +require_once DRUPAL_ROOT . '/core/includes/file.inc.php'; +require_once DRUPAL_ROOT . '/core/includes/module.inc.php'; +require_once DRUPAL_ROOT . '/core/includes/ajax.inc.php'; // We prepare only a minimal bootstrap. This includes the database and // variables, however, so we have access to the class autoloader registry. @@ -78,8 +78,8 @@ global $conf; // We have to enable the user and system modules, even to check access and // display errors via the maintenance theme. -$module_list['system']['filename'] = 'core/modules/system/system.module'; -$module_list['user']['filename'] = 'core/modules/user/user.module'; +$module_list['system']['filename'] = 'core/modules/system/system.module.php'; +$module_list['user']['filename'] = 'core/modules/user/user.module.php'; module_list(TRUE, FALSE, FALSE, $module_list); drupal_load('module', 'system'); drupal_load('module', 'user'); @@ -98,10 +98,10 @@ $show_messages = TRUE; if (authorize_access_allowed()) { // Load both the Form API and Batch API. - require_once DRUPAL_ROOT . '/core/includes/form.inc'; - require_once DRUPAL_ROOT . '/core/includes/batch.inc'; + require_once DRUPAL_ROOT . '/core/includes/form.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/batch.inc.php'; // Load the code that drives the authorize process. - require_once DRUPAL_ROOT . '/core/includes/authorize.inc'; + require_once DRUPAL_ROOT . '/core/includes/authorize.inc.php'; // 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 fa9aa14..b4726c4 100644 --- a/core/cron.php +++ b/core/cron.php @@ -13,7 +13,7 @@ chdir('..'); */ define('DRUPAL_ROOT', getcwd()); -include_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; +include_once DRUPAL_ROOT . '/core/includes/bootstrap.inc.php'; 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.php b/core/includes/bootstrap.inc.php index 9780ed2..da3ed4b 100644 --- a/core/includes/bootstrap.inc.php +++ b/core/includes/bootstrap.inc.php @@ -907,6 +907,9 @@ function drupal_get_filename($type, $name, $filename = NULL) { elseif ($type == 'theme') { $extension = 'info'; } + elseif ($type == 'module') { + $extension = 'module.php'; + } else { $extension = $type; } @@ -914,7 +917,7 @@ function drupal_get_filename($type, $name, $filename = NULL) { if (!isset($dirs[$dir][$extension])) { $dirs[$dir][$extension] = TRUE; if (!function_exists('drupal_system_listing')) { - require_once DRUPAL_ROOT . '/core/includes/common.inc'; + require_once DRUPAL_ROOT . '/core/includes/common.inc.php'; } // Scan the appropriate directories for all files with the requested // extension, not just the file we are currently looking for. This @@ -1678,7 +1681,7 @@ function watchdog_exception($type, Exception $exception, $message = NULL, $varia $variables = array(); } - require_once DRUPAL_ROOT . '/core/includes/errors.inc'; + require_once DRUPAL_ROOT . '/core/includes/errors.inc.php'; $variables += _drupal_decode_exception($exception); watchdog($type, $message, $variables, $severity, $link); } @@ -2146,7 +2149,7 @@ function drupal_bootstrap($phase = NULL, $new_phase = TRUE) { break; case DRUPAL_BOOTSTRAP_SESSION: - require_once DRUPAL_ROOT . '/' . variable_get('session_inc', 'core/includes/session.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('session_inc', 'core/includes/session.inc.php'); drupal_session_initialize(); break; @@ -2159,7 +2162,7 @@ function drupal_bootstrap($phase = NULL, $new_phase = TRUE) { break; case DRUPAL_BOOTSTRAP_FULL: - require_once DRUPAL_ROOT . '/core/includes/common.inc'; + require_once DRUPAL_ROOT . '/core/includes/common.inc.php.php'; _drupal_bootstrap_full(); break; } @@ -2198,7 +2201,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 . '/core/includes/errors.inc'; + require_once DRUPAL_ROOT . '/core/includes/errors.inc.php'; _drupal_error_handler_real($error_level, $message, $filename, $line, $context); } @@ -2213,7 +2216,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 . '/core/includes/errors.inc'; + require_once DRUPAL_ROOT . '/core/includes/errors.inc.php'; try { // Log the message to the watchdog and return an error page to the user. @@ -2287,7 +2290,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 . '/core/includes/cache.inc'; + require_once DRUPAL_ROOT . '/core/includes/cache.inc.php'; foreach (variable_get('cache_backends', array()) as $include) { require_once DRUPAL_ROOT . '/' . $include; } @@ -2343,7 +2346,7 @@ 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 . '/core/includes/install.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc.php'; install_goto('core/install.php'); } @@ -2377,7 +2380,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 . '/core/includes/database/database.inc'; + require_once DRUPAL_ROOT . '/core/includes/database/database.inc.php'; // Register autoload functions so that we can access classes and interfaces. // The database autoload routine comes first so that we can load the database @@ -2394,13 +2397,13 @@ function _drupal_bootstrap_variables() { global $conf; // Initialize the lock system. - require_once DRUPAL_ROOT . '/' . variable_get('lock_inc', 'core/includes/lock.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('lock_inc', 'core/includes/lock.inc.php'); 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 . '/core/includes/module.inc'; + require_once DRUPAL_ROOT . '/core/includes/module.inc.php'; module_load_all(TRUE); } @@ -2492,7 +2495,7 @@ function drupal_generate_test_ua($prefix) { * @see _drupal_maintenance_theme() */ function drupal_maintenance_theme() { - require_once DRUPAL_ROOT . '/core/includes/theme.maintenance.inc'; + require_once DRUPAL_ROOT . '/core/includes/theme.maintenance.inc.php'; _drupal_maintenance_theme(); } @@ -2582,7 +2585,7 @@ function drupal_language_initialize() { $GLOBALS[$type] = $default; } if (drupal_multilingual()) { - include_once DRUPAL_ROOT . '/core/includes/language.inc'; + include_once DRUPAL_ROOT . '/core/includes/language.inc.php'; foreach ($types as $type) { $GLOBALS[$type] = language_initialize($type); } @@ -2938,7 +2941,7 @@ function drupal_get_complete_schema($rebuild = FALSE) { module_load_all_includes('install'); } - require_once DRUPAL_ROOT . '/core/includes/common.inc'; + require_once DRUPAL_ROOT . '/core/includes/common.inc.php'; // 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 @@ -3107,7 +3110,7 @@ function registry_rebuild() { * @see registry_rebuild() */ function registry_update() { - require_once DRUPAL_ROOT . '/core/includes/registry.inc'; + require_once DRUPAL_ROOT . '/core/includes/registry.inc.php'; _registry_update(); } @@ -3349,7 +3352,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 . '/core/includes/errors.inc'; + require_once DRUPAL_ROOT . '/core/includes/errors.inc.php'; if (error_displayable()) { print '

Uncaught exception thrown in shutdown function.

'; print '

' . _drupal_render_exception_safe($exception) . '

'; diff --git a/core/includes/common.inc.php b/core/includes/common.inc.php index 4229d52..1d42d8e 100644 --- a/core/includes/common.inc.php +++ b/core/includes/common.inc.php @@ -1544,7 +1544,7 @@ function filter_xss_bad_protocol($string, $decode = TRUE) { // string that needs decoding. if ($decode) { if (!function_exists('decode_entities')) { - require_once DRUPAL_ROOT . '/core/includes/unicode.inc'; + require_once DRUPAL_ROOT . '/core/includes/unicode.inc.php'; } $string = decode_entities($string); @@ -5025,20 +5025,20 @@ function _drupal_bootstrap_full() { return; } $called = TRUE; - 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'; + require_once DRUPAL_ROOT . '/' . variable_get('path_inc', 'core/includes/path.inc.php'); + require_once DRUPAL_ROOT . '/core/includes/theme.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/pager.inc.php'; + require_once DRUPAL_ROOT . '/' . variable_get('menu_inc', 'core/includes/menu.inc.php'); + require_once DRUPAL_ROOT . '/core/includes/tablesort.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/file.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/unicode.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/image.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/form.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/mail.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/actions.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/ajax.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/token.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/errors.inc.php'; // Detect string handling method unicode_check(); @@ -5293,7 +5293,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 . '/core/includes/file.inc'; + require_once DRUPAL_ROOT . '/core/includes/file.inc.php'; } foreach ($searchdir as $dir) { $files_to_add = file_scan_directory($dir, $mask, array('key' => $key, 'min_depth' => $min_depth)); @@ -7452,7 +7452,7 @@ function drupal_check_incompatibility($v, $current_version) { * failed. See xmlrpc_error(). */ function xmlrpc($url, $args, $options = array()) { - require_once DRUPAL_ROOT . '/core/includes/xmlrpc.inc'; + require_once DRUPAL_ROOT . '/core/includes/xmlrpc.inc.php'; return _xmlrpc($url, $args, $options); } diff --git a/core/includes/database/database.inc.php b/core/includes/database/database.inc.php index 77584f9..8512ca4 100644 --- a/core/includes/database/database.inc.php +++ b/core/includes/database/database.inc.php @@ -1659,7 +1659,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 . '/core/includes/database/' . $driver . '/database.inc'; + require_once DRUPAL_ROOT . '/core/includes/database/' . $driver . '/database.inc.php'; $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.php b/core/includes/database/schema.inc.php index 27934dc..c2cb738 100644 --- a/core/includes/database/schema.inc.php +++ b/core/includes/database/schema.inc.php @@ -269,7 +269,7 @@ abstract class DatabaseSchema implements QueryPlaceholderInterface { * 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 - * core/includes/databases/mysql/schema.inc. + * core/includes/databases/mysql/schema.inc.php. * * @param $table_name * The name of the table in question. diff --git a/core/includes/database/sqlite/database.inc.php b/core/includes/database/sqlite/database.inc.php index 4cef164..38d0e78 100644 --- a/core/includes/database/sqlite/database.inc.php +++ b/core/includes/database/sqlite/database.inc.php @@ -10,7 +10,7 @@ * @{ */ -include_once DRUPAL_ROOT . '/core/includes/database/prefetch.inc'; +include_once DRUPAL_ROOT . '/core/includes/database/prefetch.inc.php'; /** * Specific SQLite implementation of DatabaseConnection. diff --git a/core/includes/errors.inc.php b/core/includes/errors.inc.php index 9d3b92a..f51e72a 100644 --- a/core/includes/errors.inc.php +++ b/core/includes/errors.inc.php @@ -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 . '/core/includes/common.inc'; + require_once DRUPAL_ROOT . '/core/includes/common.inc.php'; } // We treat recoverable errors as fatal. diff --git a/core/includes/file.inc.php b/core/includes/file.inc.php index 6e6611f..5cd3f68 100644 --- a/core/includes/file.inc.php +++ b/core/includes/file.inc.php @@ -12,7 +12,7 @@ * File API is needed before a bootstrap, or in an alternate order (e.g. * maintenance theme). */ -require_once DRUPAL_ROOT . '/core/includes/stream_wrappers.inc'; +require_once DRUPAL_ROOT . '/core/includes/stream_wrappers.inc.php'; /** * @defgroup file File interface diff --git a/core/includes/form.inc.php b/core/includes/form.inc.php index a12fb34..a7fa08c 100644 --- a/core/includes/form.inc.php +++ b/core/includes/form.inc.php @@ -566,7 +566,7 @@ function form_state_keys_no_cache() { * Example: * @code * // Load node.admin.inc from Node module. - * form_load_include($form_state, 'inc', 'node', 'node.admin'); + * form_load_include($form_state, 'php', 'node', 'node.admin.inc'); * @endcode * * Use this function instead of module_load_include() from inside a form @@ -4375,7 +4375,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 . '/core/includes/batch.inc'; + require_once DRUPAL_ROOT . '/core/includes/batch.inc.php'; _batch_process(); } } @@ -4444,8 +4444,8 @@ function _batch_queue($batch_set) { // sure the files are manually included. if (!isset($queues)) { $queues = array(); - require_once DRUPAL_ROOT . '/core/modules/system/system.queue.inc'; - require_once DRUPAL_ROOT . '/core/includes/batch.queue.inc'; + require_once DRUPAL_ROOT . '/core/modules/system/system.queue.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/batch.queue.inc.php'; } if (isset($batch_set['queue'])) { diff --git a/core/includes/install.core.inc.php b/core/includes/install.core.inc.php index 66426fb..3919887 100644 --- a/core/includes/install.core.inc.php +++ b/core/includes/install.core.inc.php @@ -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 . '/core/includes/bootstrap.inc'; + require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc.php'; if (!$install_state['interactive']) { drupal_override_server_variables($install_state['server']); } @@ -241,22 +241,22 @@ function install_begin_request(&$install_state) { global $conf; 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'); + require_once DRUPAL_ROOT . '/core/includes/common.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/file.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/install.inc.php'; + require_once DRUPAL_ROOT . '/' . variable_get('path_inc', 'core/includes/path.inc.php'); // Load module basics (needed for hook invokes). - include_once DRUPAL_ROOT . '/core/includes/module.inc'; - include_once DRUPAL_ROOT . '/core/includes/session.inc'; + include_once DRUPAL_ROOT . '/core/includes/module.inc.php'; + include_once DRUPAL_ROOT . '/core/includes/session.inc.php'; // Set up $language, so t() caller functions will still work. drupal_language_initialize(); - require_once DRUPAL_ROOT . '/core/includes/ajax.inc'; - $module_list['system']['filename'] = 'core/modules/system/system.module'; - $module_list['entity']['filename'] = 'core/modules/entity/entity.module'; - $module_list['user']['filename'] = 'core/modules/user/user.module'; + require_once DRUPAL_ROOT . '/core/includes/ajax.inc.php'; + $module_list['system']['filename'] = 'core/modules/system/system.module.php'; + $module_list['entity']['filename'] = 'core/modules/entity/entity.module.php'; + $module_list['user']['filename'] = 'core/modules/user/user.module.php'; module_list(TRUE, FALSE, FALSE, $module_list); drupal_load('module', 'system'); drupal_load('module', 'entity'); @@ -271,8 +271,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 . '/core/includes/cache.inc'; - require_once DRUPAL_ROOT . '/core/includes/cache-install.inc'; + require_once DRUPAL_ROOT . '/core/includes/cache.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/cache-install.inc.php'; $conf['cache_default_class'] = 'DrupalFakeCache'; // Prepare for themed output. We need to run this at the beginning of the @@ -288,7 +288,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 . '/core/includes/database/database.inc'; + require_once DRUPAL_ROOT . '/core/includes/database/database.inc.php'; // Verify the last completed task in the database, if there is one. $task = install_verify_completed_task(); @@ -378,7 +378,7 @@ function install_run_task($task, &$install_state) { $function = $task['function']; if ($task['type'] == 'form') { - require_once DRUPAL_ROOT . '/core/includes/form.inc'; + require_once DRUPAL_ROOT . '/core/includes/form.inc.php'; 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 @@ -449,7 +449,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 . '/core/includes/batch.inc'; + include_once DRUPAL_ROOT . '/core/includes/batch.inc.php'; $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 @@ -1020,7 +1020,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 . '/core/includes/form.inc'; + include_once DRUPAL_ROOT . '/core/includes/form.inc.php'; drupal_set_title(st('Select an installation profile')); $form = drupal_get_form('install_select_profile_form', $install_state['profiles']); return drupal_render($form); @@ -1206,7 +1206,7 @@ function install_select_locale(&$install_state) { $output .= ''; } else { - include_once DRUPAL_ROOT . '/core/includes/form.inc'; + include_once DRUPAL_ROOT . '/core/includes/form.inc.php'; $elements = drupal_get_form('install_select_locale_form', $locales, $profilename); $output = drupal_render($elements); } @@ -1240,7 +1240,7 @@ function install_select_locale(&$install_state) { // URL. if ($install_state['interactive']) { drupal_set_title(st('Choose language')); - include_once DRUPAL_ROOT . '/core/includes/form.inc'; + include_once DRUPAL_ROOT . '/core/includes/form.inc.php'; $elements = drupal_get_form('install_select_locale_form', $locales, $profilename); return drupal_render($elements); } @@ -1255,7 +1255,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 . '/core/includes/standard.inc'; + include_once DRUPAL_ROOT . '/core/includes/standard.inc.php'; $languages = standard_language_list(); foreach ($locales as $locale) { $name = $locale->langcode; @@ -1393,11 +1393,11 @@ 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 . '/core/includes/locale.inc'; + include_once DRUPAL_ROOT . '/core/includes/locale.inc.php'; include_once drupal_get_path('module', 'locale') . '/locale.bulk.inc'; $install_locale = $install_state['parameters']['locale']; - include_once DRUPAL_ROOT . '/core/includes/standard.inc'; + include_once DRUPAL_ROOT . '/core/includes/standard.inc.php'; $predefined = standard_language_list(); if (!isset($predefined[$install_locale])) { // Drupal does not know about this language, so we prefill its values with @@ -1696,7 +1696,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 . '/core/includes/locale.inc'; + include_once DRUPAL_ROOT . '/core/includes/locale.inc.php'; $form['site_information'] = array( '#type' => 'fieldset', diff --git a/core/includes/install.inc.php b/core/includes/install.inc.php index 514d89c..c0f57a6 100644 --- a/core/includes/install.inc.php +++ b/core/includes/install.inc.php @@ -252,9 +252,9 @@ function drupal_get_database_types() { // 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 . '/core/includes/database/database.inc'; + require_once DRUPAL_ROOT . '/core/includes/database/database.inc.php'; 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')) { + if (file_exists($file->uri . '/database.inc.php') && file_exists($file->uri . '/install.inc.php')) { $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 . '/core/includes/file.inc'; - include_once DRUPAL_ROOT . '/core/includes/common.inc'; + include_once DRUPAL_ROOT . '/core/includes/file.inc.php'; + include_once DRUPAL_ROOT . '/core/includes/common.inc.php'; $profile_file = DRUPAL_ROOT . "/profiles/$profile/$profile.profile"; @@ -1009,7 +1009,7 @@ function drupal_install_fix_file($file, $mask, $message = TRUE) { */ function install_goto($path) { global $base_url; - include_once DRUPAL_ROOT . '/core/includes/common.inc'; + include_once DRUPAL_ROOT . '/core/includes/common.inc.php'; header('Location: ' . $base_url . '/' . $path); header('Cache-Control: no-cache'); // Not a permanent redirect. drupal_exit(); @@ -1108,7 +1108,7 @@ function st($string, array $args = array(), array $options = array()) { // that multiple files end with the same extension, even if unlikely. $locale_files = install_find_locale_files($install_state['parameters']['locale']); if (!empty($locale_files)) { - require_once DRUPAL_ROOT . '/core/includes/gettext.inc'; + require_once DRUPAL_ROOT . '/core/includes/gettext.inc.php'; foreach ($locale_files as $locale_file) { _locale_import_read_po('mem-store', $locale_file); } @@ -1117,7 +1117,7 @@ function st($string, array $args = array(), array $options = array()) { } } - require_once DRUPAL_ROOT . '/core/includes/theme.inc'; + require_once DRUPAL_ROOT . '/core/includes/theme.inc.php'; // Transform arguments before inserting them foreach ($args as $key => $value) { switch ($key[0]) { @@ -1146,7 +1146,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 . '/core/includes/file.inc'; + include_once DRUPAL_ROOT . '/core/includes/file.inc.php'; $profile_file = DRUPAL_ROOT . "/profiles/$profile/$profile.profile"; diff --git a/core/includes/locale.inc.php b/core/includes/locale.inc.php index 6222bda..6650f04 100644 --- a/core/includes/locale.inc.php +++ b/core/includes/locale.inc.php @@ -516,7 +516,7 @@ function locale_language_save($language) { // If name was not set, we add a predefined language. if (!isset($language->name)) { - include_once DRUPAL_ROOT . '/core/includes/standard.inc'; + include_once DRUPAL_ROOT . '/core/includes/standard.inc.php'; $predefined = standard_language_list(); $language->name = $predefined[$language->language][0]; $language->direction = isset($predefined[$language->language][2]) ? $predefined[$language->language][2] : LANGUAGE_LTR; @@ -859,7 +859,7 @@ function _locale_rebuild_js($langcode = NULL) { * Prepares the language code list for a select form item with only the unsupported ones */ function _locale_prepare_predefined_list() { - include_once DRUPAL_ROOT . '/core/includes/standard.inc'; + include_once DRUPAL_ROOT . '/core/includes/standard.inc.php'; $languages = language_list(); $predefined = standard_language_list(); foreach ($predefined as $key => $value) { @@ -884,7 +884,7 @@ function _locale_prepare_predefined_list() { * An array of all country code => country name pairs. */ function country_get_list() { - include_once DRUPAL_ROOT . '/core/includes/standard.inc'; + include_once DRUPAL_ROOT . '/core/includes/standard.inc.php'; $countries = standard_country_list(); // Allow other modules to modify the country list. drupal_alter('countries', $countries); diff --git a/core/includes/module.inc.php b/core/includes/module.inc.php index cca2ef9..72f0491 100644 --- a/core/includes/module.inc.php +++ b/core/includes/module.inc.php @@ -214,7 +214,7 @@ function system_list_reset() { * without this module. */ function _module_build_dependencies($files) { - require_once DRUPAL_ROOT . '/core/includes/graph.inc'; + require_once DRUPAL_ROOT . '/core/includes/graph.inc.php'; foreach ($files as $filename => $file) { $graph[$file->name]['edges'] = array(); if (isset($file->info['dependencies']) && is_array($file->info['dependencies'])) { @@ -258,7 +258,7 @@ function module_exists($module) { */ function module_load_install($module) { // Make sure the installation API is available - include_once DRUPAL_ROOT . '/core/includes/install.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc.php'; return module_load_include('install', $module); } @@ -269,9 +269,9 @@ function module_load_install($module) { * Examples: * @code * // Load node.admin.inc from the node module. - * module_load_include('inc', 'node', 'node.admin'); + * module_load_include('php', 'node', 'node.admin.inc'); * // Load content_types.inc from the node module. - * module_load_include('inc', 'node', 'content_types'); + * module_load_include('php', 'node', 'content_types.inc'); * @endcode * * Do not use this function to load an install file, use module_load_install() @@ -391,7 +391,7 @@ function module_enable($module_list, $enable_dependencies = TRUE) { } // Required for module installation checks. - include_once DRUPAL_ROOT . '/core/includes/install.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc.php'; $modules_installed = array(); $modules_enabled = array(); @@ -605,7 +605,7 @@ function module_hook($module, $hook) { // optional include file registered via hook_hook_info(). $hook_info = module_hook_info(); if (isset($hook_info[$hook]['group'])) { - module_load_include('inc', $module, $module . '.' . $hook_info[$hook]['group']); + module_load_include('php', $module, $module . '.' . $hook_info[$hook]['group'] . '.inc'); if (function_exists($function)) { return TRUE; } @@ -654,7 +654,7 @@ function module_implements($hook, $sort = FALSE) { $implementations[$hook] = array(); $list = module_list(FALSE, FALSE, $sort); foreach ($list as $module) { - $include_file = isset($hook_info[$hook]['group']) && module_load_include('inc', $module, $module . '.' . $hook_info[$hook]['group']); + $include_file = isset($hook_info[$hook]['group']) && module_load_include('php', $module, $module . '.' . $hook_info[$hook]['group'] . '.inc'); // Since module_hook() may needlessly try to load the include file again, // function_exists() is used directly here. if (function_exists($module . '_' . $hook)) { @@ -672,7 +672,7 @@ function module_implements($hook, $sort = FALSE) { // If this hook implementation is stored in a lazy-loaded file, so include // that file first. if ($group) { - module_load_include('inc', $module, "$module.$group"); + module_load_include('php', $module, "$module.$group.inc"); } // It is possible that a module removed a hook implementation without the // implementations cache being rebuilt yet, so we check whether the diff --git a/core/includes/registry.inc.php b/core/includes/registry.inc.php index 8961f7a..7390c1d 100644 --- a/core/includes/registry.inc.php +++ b/core/includes/registry.inc.php @@ -29,9 +29,9 @@ function _registry_update() { // registry rebuild process runs. $connection_info = Database::getConnectionInfo(); $driver = $connection_info['default']['driver']; - 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'; + require_once DRUPAL_ROOT . '/core/includes/database/query.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/database/select.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/database/' . $driver . '/query.inc.php'; // 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('core/includes', '/\.inc$/') as $filename => $file) { + foreach (file_scan_directory('core/includes', '/\.inc\.php$/') as $filename => $file) { $files["$filename"] = array('module' => '', 'weight' => 0); } diff --git a/core/includes/session.inc.php b/core/includes/session.inc.php index df70f0e..c04a881 100644 --- a/core/includes/session.inc.php +++ b/core/includes/session.inc.php @@ -219,7 +219,7 @@ function _drupal_session_write($sid, $value) { return TRUE; } catch (Exception $exception) { - require_once DRUPAL_ROOT . '/core/includes/errors.inc'; + require_once DRUPAL_ROOT . '/core/includes/errors.inc.php'; // 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.php b/core/includes/stream_wrappers.inc.php index 650d94d..30e707f 100644 --- a/core/includes/stream_wrappers.inc.php +++ b/core/includes/stream_wrappers.inc.php @@ -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 . '/core/includes/file.mimetypes.inc'; + include_once DRUPAL_ROOT . '/core/includes/file.mimetypes.inc.php'; $mapping = file_mimetype_mapping(); } diff --git a/core/includes/theme.maintenance.inc.php b/core/includes/theme.maintenance.inc.php index fcd8703..1877657 100644 --- a/core/includes/theme.maintenance.inc.php +++ b/core/includes/theme.maintenance.inc.php @@ -22,12 +22,12 @@ function _drupal_maintenance_theme() { return; } - 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'; + require_once DRUPAL_ROOT . '/' . variable_get('path_inc', 'core/includes/path.inc.php'); + require_once DRUPAL_ROOT . '/core/includes/theme.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/common.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/unicode.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/file.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/module.inc.php'; 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 . '/core/includes/database/database.inc'; + require_once DRUPAL_ROOT . '/core/includes/database/database.inc.php'; } // 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'] = 'core/modules/system/system.module'; + $module_list['system']['filename'] = 'core/modules/system/system.module.php'; module_list(TRUE, FALSE, FALSE, $module_list); drupal_load('module', 'system'); } diff --git a/core/includes/update.inc.php b/core/includes/update.inc.php index c60d0bc..f319168 100644 --- a/core/includes/update.inc.php +++ b/core/includes/update.inc.php @@ -81,8 +81,8 @@ 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 . '/core/includes/install.inc'; - include_once DRUPAL_ROOT . '/core/modules/entity/entity.controller.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc.php'; + include_once DRUPAL_ROOT . '/core/modules/entity/entity.controller.inc.php'; drupal_bootstrap(DRUPAL_BOOTSTRAP_DATABASE); // If the site has not updated to Drupal 8 yet, check to make sure that it is @@ -212,7 +212,7 @@ function update_do_one($module, $number, $dependency_map, &$context) { catch (Exception $e) { watchdog_exception('update', $e); - require_once DRUPAL_ROOT . '/core/includes/errors.inc'; + require_once DRUPAL_ROOT . '/core/includes/errors.inc.php'; $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)); @@ -314,7 +314,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' => 'core/includes/update.inc', + 'file' => 'core/includes/update.inc.php', ); batch_set($batch); batch_process($redirect, $url, $redirect_callback); @@ -462,7 +462,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 . '/core/includes/graph.inc'; + require_once DRUPAL_ROOT . '/core/includes/graph.inc.php'; drupal_depth_first_search($graph); uasort($graph, 'drupal_sort_weight'); diff --git a/core/install.php b/core/install.php index 01f54b7..6a3853e 100644 --- a/core/install.php +++ b/core/install.php @@ -28,5 +28,5 @@ if (version_compare(PHP_VERSION, '5.3.2') < 0) { } // Start the installer. -require_once DRUPAL_ROOT . '/core/includes/install.core.inc'; +require_once DRUPAL_ROOT . '/core/includes/install.core.inc.php'; install_drupal(); diff --git a/core/modules/aggregator/aggregator.module.php b/core/modules/aggregator/aggregator.module.php index f247d26..3cc1f58 100644 --- a/core/modules/aggregator/aggregator.module.php +++ b/core/modules/aggregator/aggregator.module.php @@ -51,16 +51,16 @@ function aggregator_theme() { return array( 'aggregator_wrapper' => array( 'variables' => array('content' => NULL), - 'file' => 'aggregator.pages.inc', + 'file' => 'aggregator.pages.inc.php', 'template' => 'aggregator-wrapper', ), 'aggregator_categorize_items' => array( 'render element' => 'form', - 'file' => 'aggregator.pages.inc', + 'file' => 'aggregator.pages.inc.php', ), 'aggregator_feed_source' => array( 'variables' => array('feed' => NULL), - 'file' => 'aggregator.pages.inc', + 'file' => 'aggregator.pages.inc.php', 'template' => 'aggregator-feed-source', ), 'aggregator_block_item' => array( @@ -68,26 +68,26 @@ function aggregator_theme() { ), 'aggregator_summary_items' => array( 'variables' => array('summary_items' => NULL, 'source' => NULL), - 'file' => 'aggregator.pages.inc', + 'file' => 'aggregator.pages.inc.php', 'template' => 'aggregator-summary-items', ), 'aggregator_summary_item' => array( 'variables' => array('item' => NULL), - 'file' => 'aggregator.pages.inc', + 'file' => 'aggregator.pages.inc.php', 'template' => 'aggregator-summary-item', ), 'aggregator_item' => array( 'variables' => array('item' => NULL), - 'file' => 'aggregator.pages.inc', + 'file' => 'aggregator.pages.inc.php', 'template' => 'aggregator-item', ), 'aggregator_page_opml' => array( 'variables' => array('feeds' => NULL), - 'file' => 'aggregator.pages.inc', + 'file' => 'aggregator.pages.inc.php', ), 'aggregator_page_rss' => array( 'variables' => array('feeds' => NULL, 'category' => NULL), - 'file' => 'aggregator.pages.inc', + 'file' => 'aggregator.pages.inc.php', ), ); } @@ -102,7 +102,7 @@ function aggregator_menu() { 'page callback' => 'aggregator_admin_overview', 'access arguments' => array('administer news feeds'), 'weight' => 10, - 'file' => 'aggregator.admin.inc', + 'file' => 'aggregator.admin.inc.php', ); $items['admin/config/services/aggregator/add/feed'] = array( 'title' => 'Add feed', @@ -110,7 +110,7 @@ function aggregator_menu() { 'page arguments' => array('aggregator_form_feed'), 'access arguments' => array('administer news feeds'), 'type' => MENU_LOCAL_ACTION, - 'file' => 'aggregator.admin.inc', + 'file' => 'aggregator.admin.inc.php', ); $items['admin/config/services/aggregator/add/category'] = array( 'title' => 'Add category', @@ -118,7 +118,7 @@ function aggregator_menu() { 'page arguments' => array('aggregator_form_category'), 'access arguments' => array('administer news feeds'), 'type' => MENU_LOCAL_ACTION, - 'file' => 'aggregator.admin.inc', + 'file' => 'aggregator.admin.inc.php', ); $items['admin/config/services/aggregator/add/opml'] = array( 'title' => 'Import OPML', @@ -126,21 +126,21 @@ function aggregator_menu() { 'page arguments' => array('aggregator_form_opml'), 'access arguments' => array('administer news feeds'), 'type' => MENU_LOCAL_ACTION, - 'file' => 'aggregator.admin.inc', + 'file' => 'aggregator.admin.inc.php', ); $items['admin/config/services/aggregator/remove/%aggregator_feed'] = array( 'title' => 'Remove items', 'page callback' => 'drupal_get_form', 'page arguments' => array('aggregator_admin_remove_feed', 5), 'access arguments' => array('administer news feeds'), - 'file' => 'aggregator.admin.inc', + 'file' => 'aggregator.admin.inc.php', ); $items['admin/config/services/aggregator/update/%aggregator_feed'] = array( 'title' => 'Update items', 'page callback' => 'aggregator_admin_refresh_feed', 'page arguments' => array(5), 'access arguments' => array('administer news feeds'), - 'file' => 'aggregator.admin.inc', + 'file' => 'aggregator.admin.inc.php', ); $items['admin/config/services/aggregator/list'] = array( 'title' => 'List', @@ -154,40 +154,40 @@ function aggregator_menu() { 'page arguments' => array('aggregator_admin_form'), 'access arguments' => array('administer news feeds'), 'type' => MENU_LOCAL_TASK, - 'file' => 'aggregator.admin.inc', + 'file' => 'aggregator.admin.inc.php', ); $items['aggregator'] = array( 'title' => 'Feed aggregator', 'page callback' => 'aggregator_page_last', 'access arguments' => array('access news feeds'), 'weight' => 5, - 'file' => 'aggregator.pages.inc', + 'file' => 'aggregator.pages.inc.php', ); $items['aggregator/sources'] = array( 'title' => 'Sources', 'page callback' => 'aggregator_page_sources', 'access arguments' => array('access news feeds'), - 'file' => 'aggregator.pages.inc', + 'file' => 'aggregator.pages.inc.php', ); $items['aggregator/categories'] = array( 'title' => 'Categories', 'page callback' => 'aggregator_page_categories', 'access callback' => '_aggregator_has_categories', - 'file' => 'aggregator.pages.inc', + 'file' => 'aggregator.pages.inc.php', ); $items['aggregator/rss'] = array( 'title' => 'RSS feed', 'page callback' => 'aggregator_page_rss', 'access arguments' => array('access news feeds'), 'type' => MENU_CALLBACK, - 'file' => 'aggregator.pages.inc', + 'file' => 'aggregator.pages.inc.php', ); $items['aggregator/opml'] = array( 'title' => 'OPML feed', 'page callback' => 'aggregator_page_opml', 'access arguments' => array('access news feeds'), 'type' => MENU_CALLBACK, - 'file' => 'aggregator.pages.inc', + 'file' => 'aggregator.pages.inc.php', ); $items['aggregator/categories/%aggregator_category'] = array( 'title callback' => '_aggregator_category_title', @@ -195,7 +195,7 @@ function aggregator_menu() { 'page callback' => 'aggregator_page_category', 'page arguments' => array(2), 'access arguments' => array('access news feeds'), - 'file' => 'aggregator.pages.inc', + 'file' => 'aggregator.pages.inc.php', ); $items['aggregator/categories/%aggregator_category/view'] = array( 'title' => 'View', @@ -208,7 +208,7 @@ function aggregator_menu() { 'page arguments' => array('aggregator_page_category_form', 2), 'access arguments' => array('administer news feeds'), 'type' => MENU_LOCAL_TASK, - 'file' => 'aggregator.pages.inc', + 'file' => 'aggregator.pages.inc.php', ); $items['aggregator/categories/%aggregator_category/configure'] = array( 'title' => 'Configure', @@ -217,13 +217,13 @@ function aggregator_menu() { 'access arguments' => array('administer news feeds'), 'type' => MENU_LOCAL_TASK, 'weight' => 1, - 'file' => 'aggregator.admin.inc', + 'file' => 'aggregator.admin.inc.php', ); $items['aggregator/sources/%aggregator_feed'] = array( 'page callback' => 'aggregator_page_source', 'page arguments' => array(2), 'access arguments' => array('access news feeds'), - 'file' => 'aggregator.pages.inc', + 'file' => 'aggregator.pages.inc.php', ); $items['aggregator/sources/%aggregator_feed/view'] = array( 'title' => 'View', @@ -236,7 +236,7 @@ function aggregator_menu() { 'page arguments' => array('aggregator_page_source_form', 2), 'access arguments' => array('administer news feeds'), 'type' => MENU_LOCAL_TASK, - 'file' => 'aggregator.pages.inc', + 'file' => 'aggregator.pages.inc.php', ); $items['aggregator/sources/%aggregator_feed/configure'] = array( 'title' => 'Configure', @@ -245,21 +245,21 @@ function aggregator_menu() { 'access arguments' => array('administer news feeds'), 'type' => MENU_LOCAL_TASK, 'weight' => 1, - 'file' => 'aggregator.admin.inc', + 'file' => 'aggregator.admin.inc.php', ); $items['admin/config/services/aggregator/edit/feed/%aggregator_feed'] = array( 'title' => 'Edit feed', 'page callback' => 'drupal_get_form', 'page arguments' => array('aggregator_form_feed', 6), 'access arguments' => array('administer news feeds'), - 'file' => 'aggregator.admin.inc', + 'file' => 'aggregator.admin.inc.php', ); $items['admin/config/services/aggregator/edit/category/%aggregator_category'] = array( 'title' => 'Edit category', 'page callback' => 'drupal_get_form', 'page arguments' => array('aggregator_form_category', 6), 'access arguments' => array('administer news feeds'), - 'file' => 'aggregator.admin.inc', + 'file' => 'aggregator.admin.inc.php', ); return $items; diff --git a/core/modules/block/block.module.php b/core/modules/block/block.module.php index b6ea373..c979d73 100644 --- a/core/modules/block/block.module.php +++ b/core/modules/block/block.module.php @@ -82,7 +82,7 @@ function block_theme() { ), 'block_admin_display_form' => array( 'template' => 'block-admin-display-form', - 'file' => 'block.admin.inc', + 'file' => 'block.admin.inc.php', 'render element' => 'form', ), ); @@ -110,14 +110,14 @@ function block_menu() { 'page callback' => 'block_admin_display', 'page arguments' => array($default_theme), 'access arguments' => array('administer blocks'), - 'file' => 'block.admin.inc', + 'file' => 'block.admin.inc.php', ); $items['admin/structure/block/manage/%/%'] = array( 'title' => 'Configure block', 'page callback' => 'drupal_get_form', 'page arguments' => array('block_admin_configure', 4, 5), 'access arguments' => array('administer blocks'), - 'file' => 'block.admin.inc', + 'file' => 'block.admin.inc.php', ); $items['admin/structure/block/manage/%/%/configure'] = array( 'title' => 'Configure block', @@ -131,7 +131,7 @@ function block_menu() { 'access arguments' => array('administer blocks'), 'type' => MENU_LOCAL_TASK, 'context' => MENU_CONTEXT_NONE, - 'file' => 'block.admin.inc', + 'file' => 'block.admin.inc.php', ); $items['admin/structure/block/add'] = array( 'title' => 'Add block', @@ -139,7 +139,7 @@ function block_menu() { 'page arguments' => array('block_add_block_form'), 'access arguments' => array('administer blocks'), 'type' => MENU_LOCAL_ACTION, - 'file' => 'block.admin.inc', + 'file' => 'block.admin.inc.php', ); foreach (list_themes() as $key => $theme) { $items['admin/structure/block/list/' . $key] = array( @@ -149,7 +149,7 @@ function block_menu() { 'weight' => $key == $default_theme ? -10 : 0, 'access callback' => '_block_themes_access', 'access arguments' => array($key), - 'file' => 'block.admin.inc', + 'file' => 'block.admin.inc.php', ); if ($key != $default_theme) { $items['admin/structure/block/list/' . $key . '/add'] = array( @@ -158,7 +158,7 @@ function block_menu() { 'page arguments' => array('block_add_block_form'), 'access arguments' => array('administer blocks'), 'type' => MENU_LOCAL_ACTION, - 'file' => 'block.admin.inc', + 'file' => 'block.admin.inc.php', ); } $items['admin/structure/block/demo/' . $key] = array( @@ -170,7 +170,7 @@ function block_menu() { 'access arguments' => array($key), 'theme callback' => '_block_custom_theme', 'theme arguments' => array($key), - 'file' => 'block.admin.inc', + 'file' => 'block.admin.inc.php', ); } return $items; diff --git a/core/modules/book/book.module.php b/core/modules/book/book.module.php index fee2467..d9bf24d 100644 --- a/core/modules/book/book.module.php +++ b/core/modules/book/book.module.php @@ -129,7 +129,7 @@ function book_menu() { 'page callback' => 'book_admin_overview', 'access arguments' => array('administer book outlines'), 'type' => MENU_LOCAL_TASK, - 'file' => 'book.admin.inc', + 'file' => 'book.admin.inc.php', ); $items['admin/content/book/list'] = array( 'title' => 'List', @@ -142,7 +142,7 @@ function book_menu() { 'access arguments' => array('administer site configuration'), 'type' => MENU_LOCAL_TASK, 'weight' => 8, - 'file' => 'book.admin.inc', + 'file' => 'book.admin.inc.php', ); $items['admin/content/book/%node'] = array( 'title' => 'Re-order book pages and change titles', @@ -151,21 +151,21 @@ function book_menu() { 'access callback' => '_book_outline_access', 'access arguments' => array(3), 'type' => MENU_CALLBACK, - 'file' => 'book.admin.inc', + 'file' => 'book.admin.inc.php', ); $items['book'] = array( 'title' => 'Books', 'page callback' => 'book_render', 'access arguments' => array('access content'), 'type' => MENU_SUGGESTED_ITEM, - 'file' => 'book.pages.inc', + 'file' => 'book.pages.inc.php', ); $items['book/export/%/%'] = array( 'page callback' => 'book_export', 'page arguments' => array(2, 3), 'access arguments' => array('access printer-friendly version'), 'type' => MENU_CALLBACK, - 'file' => 'book.pages.inc', + 'file' => 'book.pages.inc.php', ); $items['node/%node/outline'] = array( 'title' => 'Outline', @@ -175,7 +175,7 @@ function book_menu() { 'access arguments' => array(1), 'type' => MENU_LOCAL_TASK, 'weight' => 2, - 'file' => 'book.pages.inc', + 'file' => 'book.pages.inc.php', ); $items['node/%node/outline/remove'] = array( 'title' => 'Remove from outline', @@ -183,7 +183,7 @@ function book_menu() { 'page arguments' => array('book_remove_form', 1), 'access callback' => '_book_outline_remove_access', 'access arguments' => array(1), - 'file' => 'book.pages.inc', + 'file' => 'book.pages.inc.php', ); return $items; diff --git a/core/modules/comment/comment.module.php b/core/modules/comment/comment.module.php index ae9278c..0791ba0 100644 --- a/core/modules/comment/comment.module.php +++ b/core/modules/comment/comment.module.php @@ -223,7 +223,7 @@ function comment_menu() { 'page callback' => 'comment_admin', 'access arguments' => array('administer comments'), 'type' => MENU_LOCAL_TASK | MENU_NORMAL_ITEM, - 'file' => 'comment.admin.inc', + 'file' => 'comment.admin.inc.php', ); // Tabs begin here. $items['admin/content/comment/new'] = array( @@ -265,7 +265,7 @@ function comment_menu() { 'page callback' => 'comment_approve', 'page arguments' => array(1), 'access arguments' => array('administer comments'), - 'file' => 'comment.pages.inc', + 'file' => 'comment.pages.inc.php', 'weight' => 1, ); $items['comment/%/delete'] = array( @@ -274,7 +274,7 @@ function comment_menu() { 'page arguments' => array(1), 'access arguments' => array('administer comments'), 'type' => MENU_LOCAL_TASK, - 'file' => 'comment.admin.inc', + 'file' => 'comment.admin.inc.php', 'weight' => 2, ); $items['comment/reply/%node'] = array( @@ -283,7 +283,7 @@ function comment_menu() { 'page arguments' => array(2), 'access callback' => 'node_access', 'access arguments' => array('view', 2), - 'file' => 'comment.pages.inc', + 'file' => 'comment.pages.inc.php', ); return $items; diff --git a/core/modules/contact/contact.module.php b/core/modules/contact/contact.module.php index 9388877..8907101 100644 --- a/core/modules/contact/contact.module.php +++ b/core/modules/contact/contact.module.php @@ -60,7 +60,7 @@ function contact_menu() { 'description' => 'Create a system contact form and set up categories for the form to use.', 'page callback' => 'contact_category_list', 'access arguments' => array('administer contact forms'), - 'file' => 'contact.admin.inc', + 'file' => 'contact.admin.inc.php', ); $items['admin/structure/contact/add'] = array( 'title' => 'Add category', @@ -69,21 +69,21 @@ function contact_menu() { 'access arguments' => array('administer contact forms'), 'type' => MENU_LOCAL_ACTION, 'weight' => 1, - 'file' => 'contact.admin.inc', + 'file' => 'contact.admin.inc.php', ); $items['admin/structure/contact/edit/%contact'] = array( 'title' => 'Edit contact category', 'page callback' => 'drupal_get_form', 'page arguments' => array('contact_category_edit_form', 4), 'access arguments' => array('administer contact forms'), - 'file' => 'contact.admin.inc', + 'file' => 'contact.admin.inc.php', ); $items['admin/structure/contact/delete/%contact'] = array( 'title' => 'Delete contact', 'page callback' => 'drupal_get_form', 'page arguments' => array('contact_category_delete_form', 4), 'access arguments' => array('administer contact forms'), - 'file' => 'contact.admin.inc', + 'file' => 'contact.admin.inc.php', ); $items['contact'] = array( 'title' => 'Contact', @@ -91,7 +91,7 @@ function contact_menu() { 'page arguments' => array('contact_site_form'), 'access arguments' => array('access site-wide contact form'), 'type' => MENU_SUGGESTED_ITEM, - 'file' => 'contact.pages.inc', + 'file' => 'contact.pages.inc.php', ); $items['user/%user/contact'] = array( 'title' => 'Contact', @@ -101,7 +101,7 @@ function contact_menu() { 'access callback' => '_contact_personal_tab_access', 'access arguments' => array(1), 'weight' => 2, - 'file' => 'contact.pages.inc', + 'file' => 'contact.pages.inc.php', ); return $items; } diff --git a/core/modules/dashboard/dashboard.module.php b/core/modules/dashboard/dashboard.module.php index 1216cc0..e2ae6e2 100644 --- a/core/modules/dashboard/dashboard.module.php +++ b/core/modules/dashboard/dashboard.module.php @@ -243,7 +243,7 @@ function dashboard_theme() { // Block module's template for the main block configuration form. 'template' => 'block-admin-display-form', 'path' => drupal_get_path('module', 'block'), - 'file' => 'block.admin.inc', + 'file' => 'block.admin.inc.php', 'render element' => 'form', ), ); @@ -311,7 +311,7 @@ function dashboard_admin($launch_customize = FALSE) { function dashboard_admin_blocks() { global $theme_key; drupal_theme_initialize(); - module_load_include('inc', 'block', 'block.admin'); + module_load_include('php', 'block', 'block.admin.inc'); // Prepare the blocks for the current theme, and remove those that are // currently displayed in non-dashboard regions. diff --git a/core/modules/dblog/dblog.module.php b/core/modules/dblog/dblog.module.php index 496a043..bbababc 100644 --- a/core/modules/dblog/dblog.module.php +++ b/core/modules/dblog/dblog.module.php @@ -43,7 +43,7 @@ function dblog_menu() { 'page callback' => 'dblog_overview', 'access arguments' => array('access site reports'), 'weight' => -1, - 'file' => 'dblog.admin.inc', + 'file' => 'dblog.admin.inc.php', ); $items['admin/reports/page-not-found'] = array( 'title' => "Top 'page not found' errors", @@ -51,7 +51,7 @@ function dblog_menu() { 'page callback' => 'dblog_top', 'page arguments' => array('page not found'), 'access arguments' => array('access site reports'), - 'file' => 'dblog.admin.inc', + 'file' => 'dblog.admin.inc.php', ); $items['admin/reports/access-denied'] = array( 'title' => "Top 'access denied' errors", @@ -59,14 +59,14 @@ function dblog_menu() { 'page callback' => 'dblog_top', 'page arguments' => array('access denied'), 'access arguments' => array('access site reports'), - 'file' => 'dblog.admin.inc', + 'file' => 'dblog.admin.inc.php', ); $items['admin/reports/event/%'] = array( 'title' => 'Details', 'page callback' => 'dblog_event', 'page arguments' => array(3), 'access arguments' => array('access site reports'), - 'file' => 'dblog.admin.inc', + 'file' => 'dblog.admin.inc.php', ); if (module_exists('search')) { @@ -76,7 +76,7 @@ function dblog_menu() { 'page callback' => 'dblog_top', 'page arguments' => array('search'), 'access arguments' => array('access site reports'), - 'file' => 'dblog.admin.inc', + 'file' => 'dblog.admin.inc.php', ); } @@ -178,7 +178,7 @@ function dblog_theme() { return array( 'dblog_message' => array( 'variables' => array('event' => NULL, 'link' => FALSE), - 'file' => 'dblog.admin.inc', + 'file' => 'dblog.admin.inc.php', ), ); } diff --git a/core/modules/field/field.module.php b/core/modules/field/field.module.php index 70b17f5..66226be 100644 --- a/core/modules/field/field.module.php +++ b/core/modules/field/field.module.php @@ -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 . '/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'; +require_once DRUPAL_ROOT . '/core/modules/field/field.crud.inc.php'; +require_once DRUPAL_ROOT . '/core/modules/field/field.default.inc.php'; +require_once DRUPAL_ROOT . '/core/modules/field/field.info.inc.php'; +require_once DRUPAL_ROOT . '/core/modules/field/field.multilingual.inc.php'; +require_once DRUPAL_ROOT . '/core/modules/field/field.attach.inc.php'; +require_once DRUPAL_ROOT . '/core/modules/field/field.form.inc.php'; /** * @defgroup field Field API @@ -375,7 +375,7 @@ function field_cron() { * Implements hook_modules_uninstalled(). */ function field_modules_uninstalled($modules) { - module_load_include('inc', 'field', 'field.crud'); + module_load_include('php', 'field', 'field.crud.inc'); foreach ($modules as $module) { // TODO D7: field_module_delete is not yet implemented // field_module_delete($module); diff --git a/core/modules/field/tests/field.test b/core/modules/field/tests/field.test index 214eab4..b18374b 100644 --- a/core/modules/field/tests/field.test +++ b/core/modules/field/tests/field.test @@ -2642,7 +2642,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 . '/core/includes/locale.inc'; + require_once DRUPAL_ROOT . '/core/includes/locale.inc.php'; for ($i = 0; $i < 3; ++$i) { $language = (object) array( 'language' => 'l' . $i, diff --git a/core/modules/field/tests/field_test.module.php b/core/modules/field/tests/field_test.module.php index ef2fedb..a18289d 100644 --- a/core/modules/field/tests/field_test.module.php +++ b/core/modules/field/tests/field_test.module.php @@ -13,9 +13,9 @@ * test helper functions */ -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'; +require_once DRUPAL_ROOT . '/core/modules/field/tests/field_test.entity.inc.php'; +require_once DRUPAL_ROOT . '/core/modules/field/tests/field_test.field.inc.php'; +require_once DRUPAL_ROOT . '/core/modules/field/tests/field_test.storage.inc.php'; /** * Implements hook_permission(). diff --git a/core/modules/field_ui/field_ui.module.php b/core/modules/field_ui/field_ui.module.php index 90559cf..e1fd6e4 100644 --- a/core/modules/field_ui/field_ui.module.php +++ b/core/modules/field_ui/field_ui.module.php @@ -68,7 +68,7 @@ function field_ui_menu() { 'page callback' => 'field_ui_fields_list', 'access arguments' => array('administer content types'), 'type' => MENU_NORMAL_ITEM, - 'file' => 'field_ui.admin.inc', + 'file' => 'field_ui.admin.inc.php', ); // Create tabs for all possible bundles. @@ -110,7 +110,7 @@ function field_ui_menu() { 'page arguments' => array('field_ui_field_overview_form', $entity_type, $bundle_arg), 'type' => MENU_LOCAL_TASK, 'weight' => 1, - 'file' => 'field_ui.admin.inc', + 'file' => 'field_ui.admin.inc.php', ) + $access; $items["$path/fields/%field_ui_menu"] = array( 'load arguments' => array($entity_type, $bundle_arg, $bundle_pos, '%map'), @@ -118,7 +118,7 @@ function field_ui_menu() { 'title arguments' => array($field_position), 'page callback' => 'drupal_get_form', 'page arguments' => array('field_ui_field_edit_form', $field_position), - 'file' => 'field_ui.admin.inc', + 'file' => 'field_ui.admin.inc.php', ) + $access; $items["$path/fields/%field_ui_menu/edit"] = array( 'load arguments' => array($entity_type, $bundle_arg, $bundle_pos, '%map'), @@ -126,7 +126,7 @@ function field_ui_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('field_ui_field_edit_form', $field_position), 'type' => MENU_DEFAULT_LOCAL_TASK, - 'file' => 'field_ui.admin.inc', + 'file' => 'field_ui.admin.inc.php', ) + $access; $items["$path/fields/%field_ui_menu/field-settings"] = array( 'load arguments' => array($entity_type, $bundle_arg, $bundle_pos, '%map'), @@ -134,7 +134,7 @@ function field_ui_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('field_ui_field_settings_form', $field_position), 'type' => MENU_LOCAL_TASK, - 'file' => 'field_ui.admin.inc', + 'file' => 'field_ui.admin.inc.php', ) + $access; $items["$path/fields/%field_ui_menu/widget-type"] = array( 'load arguments' => array($entity_type, $bundle_arg, $bundle_pos, '%map'), @@ -142,7 +142,7 @@ function field_ui_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('field_ui_widget_type_form', $field_position), 'type' => MENU_LOCAL_TASK, - 'file' => 'field_ui.admin.inc', + 'file' => 'field_ui.admin.inc.php', ) + $access; $items["$path/fields/%field_ui_menu/delete"] = array( 'load arguments' => array($entity_type, $bundle_arg, $bundle_pos, '%map'), @@ -151,7 +151,7 @@ function field_ui_menu() { 'page arguments' => array('field_ui_field_delete_form', $field_position), 'type' => MENU_VISIBLE_IN_BREADCRUMB, 'weight' => 10, - 'file' => 'field_ui.admin.inc', + 'file' => 'field_ui.admin.inc.php', ) + $access; // 'Manage display' tab. @@ -161,7 +161,7 @@ function field_ui_menu() { 'page arguments' => array('field_ui_display_overview_form', $entity_type, $bundle_arg, 'default'), 'type' => MENU_LOCAL_TASK, 'weight' => 2, - 'file' => 'field_ui.admin.inc', + 'file' => 'field_ui.admin.inc.php', ) + $access; // View modes secondary tabs. @@ -184,7 +184,7 @@ function field_ui_menu() { 'access arguments' => array_merge(array($entity_type, $bundle_arg, $view_mode, $access['access callback']), $access['access arguments']), 'type' => ($view_mode == 'default' ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK), 'weight' => ($view_mode == 'default' ? -10 : $weight++), - 'file' => 'field_ui.admin.inc', + 'file' => 'field_ui.admin.inc.php', ); } } diff --git a/core/modules/file/file.module.php b/core/modules/file/file.module.php index b7d2f3c..f8e490a 100644 --- a/core/modules/file/file.module.php +++ b/core/modules/file/file.module.php @@ -6,7 +6,7 @@ */ // Load all Field module hooks for File. -require_once DRUPAL_ROOT . '/core/modules/file/file.field.inc'; +require_once DRUPAL_ROOT . '/core/modules/file/file.field.inc.php'; /** * Implements hook_help(). diff --git a/core/modules/filter/filter.module.php b/core/modules/filter/filter.module.php index 2ad725a..63ea46b 100644 --- a/core/modules/filter/filter.module.php +++ b/core/modules/filter/filter.module.php @@ -45,15 +45,15 @@ function filter_theme() { return array( 'filter_admin_overview' => array( 'render element' => 'form', - 'file' => 'filter.admin.inc', + 'file' => 'filter.admin.inc.php', ), 'filter_admin_format_filter_order' => array( 'render element' => 'element', - 'file' => 'filter.admin.inc', + 'file' => 'filter.admin.inc.php', ), 'filter_tips' => array( 'variables' => array('tips' => NULL, 'long' => FALSE), - 'file' => 'filter.pages.inc', + 'file' => 'filter.pages.inc.php', ), 'text_format_wrapper' => array( 'render element' => 'element', @@ -90,7 +90,7 @@ function filter_menu() { 'page callback' => 'filter_tips_long', 'access callback' => TRUE, 'type' => MENU_SUGGESTED_ITEM, - 'file' => 'filter.pages.inc', + 'file' => 'filter.pages.inc.php', ); $items['admin/config/content/formats'] = array( 'title' => 'Text formats', @@ -98,7 +98,7 @@ function filter_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('filter_admin_overview'), 'access arguments' => array('administer filters'), - 'file' => 'filter.admin.inc', + 'file' => 'filter.admin.inc.php', ); $items['admin/config/content/formats/list'] = array( 'title' => 'List', @@ -110,7 +110,7 @@ function filter_menu() { 'access arguments' => array('administer filters'), 'type' => MENU_LOCAL_ACTION, 'weight' => 1, - 'file' => 'filter.admin.inc', + 'file' => 'filter.admin.inc.php', ); $items['admin/config/content/formats/%filter_format'] = array( 'title callback' => 'filter_admin_format_title', @@ -118,7 +118,7 @@ function filter_menu() { 'page callback' => 'filter_admin_format_page', 'page arguments' => array(4), 'access arguments' => array('administer filters'), - 'file' => 'filter.admin.inc', + 'file' => 'filter.admin.inc.php', ); $items['admin/config/content/formats/%filter_format/disable'] = array( 'title' => 'Disable text format', @@ -126,7 +126,7 @@ function filter_menu() { 'page arguments' => array('filter_admin_disable', 4), 'access callback' => '_filter_disable_format_access', 'access arguments' => array(4), - 'file' => 'filter.admin.inc', + 'file' => 'filter.admin.inc.php', ); return $items; } diff --git a/core/modules/forum/forum.admin.inc.php b/core/modules/forum/forum.admin.inc.php index 49c71d9..2f35b13 100644 --- a/core/modules/forum/forum.admin.inc.php +++ b/core/modules/forum/forum.admin.inc.php @@ -235,7 +235,7 @@ function forum_admin_settings($form) { * Returns an overview list of existing forums and containers */ function forum_overview($form, &$form_state) { - module_load_include('inc', 'taxonomy', 'taxonomy.admin'); + module_load_include('php', 'taxonomy', 'taxonomy.admin.inc'); $vid = variable_get('forum_nav_vocabulary', ''); $vocabulary = taxonomy_vocabulary_load($vid); diff --git a/core/modules/forum/forum.module.php b/core/modules/forum/forum.module.php index 65c5489..312cbf3 100644 --- a/core/modules/forum/forum.module.php +++ b/core/modules/forum/forum.module.php @@ -78,7 +78,7 @@ function forum_theme() { ), 'forum_form' => array( 'render element' => 'form', - 'file' => 'forum.admin.inc', + 'file' => 'forum.admin.inc.php', ), ); } @@ -91,14 +91,14 @@ function forum_menu() { 'title' => 'Forums', 'page callback' => 'forum_page', 'access arguments' => array('access content'), - 'file' => 'forum.pages.inc', + 'file' => 'forum.pages.inc.php', ); $items['forum/%forum_forum'] = array( 'title' => 'Forums', 'page callback' => 'forum_page', 'page arguments' => array(1), 'access arguments' => array('access content'), - 'file' => 'forum.pages.inc', + 'file' => 'forum.pages.inc.php', ); $items['admin/structure/forum'] = array( 'title' => 'Forums', @@ -106,7 +106,7 @@ function forum_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('forum_overview'), 'access arguments' => array('administer forums'), - 'file' => 'forum.admin.inc', + 'file' => 'forum.admin.inc.php', ); $items['admin/structure/forum/list'] = array( 'title' => 'List', @@ -120,7 +120,7 @@ function forum_menu() { 'access arguments' => array('administer forums'), 'type' => MENU_LOCAL_ACTION, 'parent' => 'admin/structure/forum', - 'file' => 'forum.admin.inc', + 'file' => 'forum.admin.inc.php', ); $items['admin/structure/forum/add/forum'] = array( 'title' => 'Add forum', @@ -129,7 +129,7 @@ function forum_menu() { 'access arguments' => array('administer forums'), 'type' => MENU_LOCAL_ACTION, 'parent' => 'admin/structure/forum', - 'file' => 'forum.admin.inc', + 'file' => 'forum.admin.inc.php', ); $items['admin/structure/forum/settings'] = array( 'title' => 'Settings', @@ -139,21 +139,21 @@ function forum_menu() { 'weight' => 5, 'type' => MENU_LOCAL_TASK, 'parent' => 'admin/structure/forum', - 'file' => 'forum.admin.inc', + 'file' => 'forum.admin.inc.php', ); $items['admin/structure/forum/edit/container/%taxonomy_term'] = array( 'title' => 'Edit container', 'page callback' => 'forum_form_main', 'page arguments' => array('container', 5), 'access arguments' => array('administer forums'), - 'file' => 'forum.admin.inc', + 'file' => 'forum.admin.inc.php', ); $items['admin/structure/forum/edit/forum/%taxonomy_term'] = array( 'title' => 'Edit forum', 'page callback' => 'forum_form_main', 'page arguments' => array('forum', 5), 'access arguments' => array('administer forums'), - 'file' => 'forum.admin.inc', + 'file' => 'forum.admin.inc.php', ); return $items; } diff --git a/core/modules/help/help.module.php b/core/modules/help/help.module.php index 773a52d..881c4b8 100644 --- a/core/modules/help/help.module.php +++ b/core/modules/help/help.module.php @@ -15,7 +15,7 @@ function help_menu() { 'page callback' => 'help_main', 'access arguments' => array('access administration pages'), 'weight' => 9, - 'file' => 'help.admin.inc', + 'file' => 'help.admin.inc.php', ); foreach (module_implements('help', TRUE) as $module) { @@ -25,7 +25,7 @@ function help_menu() { 'page arguments' => array(2), 'access arguments' => array('access administration pages'), 'type' => MENU_VISIBLE_IN_BREADCRUMB, - 'file' => 'help.admin.inc', + 'file' => 'help.admin.inc.php', ); } diff --git a/core/modules/image/image.module.php b/core/modules/image/image.module.php index 54d98eb..beaeba2 100644 --- a/core/modules/image/image.module.php +++ b/core/modules/image/image.module.php @@ -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 . '/core/modules/image/image.field.inc'; +require_once DRUPAL_ROOT . '/core/modules/image/image.field.inc.php'; /** * Implement of hook_help(). @@ -97,7 +97,7 @@ function image_menu() { 'description' => 'Configure styles that can be used for resizing or adjusting images on display.', 'page callback' => 'image_style_list', 'access arguments' => array('administer image styles'), - 'file' => 'image.admin.inc', + 'file' => 'image.admin.inc.php', ); $items['admin/config/media/image-styles/list'] = array( 'title' => 'List', @@ -106,7 +106,7 @@ function image_menu() { 'access arguments' => array('administer image styles'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => 1, - 'file' => 'image.admin.inc', + 'file' => 'image.admin.inc.php', ); $items['admin/config/media/image-styles/add'] = array( 'title' => 'Add style', @@ -116,7 +116,7 @@ function image_menu() { 'access arguments' => array('administer image styles'), 'type' => MENU_LOCAL_ACTION, 'weight' => 2, - 'file' => 'image.admin.inc', + 'file' => 'image.admin.inc.php', ); $items['admin/config/media/image-styles/edit/%image_style'] = array( 'title' => 'Edit style', @@ -124,7 +124,7 @@ function image_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('image_style_form', 5), 'access arguments' => array('administer image styles'), - 'file' => 'image.admin.inc', + 'file' => 'image.admin.inc.php', ); $items['admin/config/media/image-styles/delete/%image_style'] = array( 'title' => 'Delete style', @@ -133,7 +133,7 @@ function image_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('image_style_delete_form', 5), 'access arguments' => array('administer image styles'), - 'file' => 'image.admin.inc', + 'file' => 'image.admin.inc.php', ); $items['admin/config/media/image-styles/revert/%image_style'] = array( 'title' => 'Revert style', @@ -142,7 +142,7 @@ function image_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('image_style_revert_form', 5), 'access arguments' => array('administer image styles'), - 'file' => 'image.admin.inc', + 'file' => 'image.admin.inc.php', ); $items['admin/config/media/image-styles/edit/%image_style/effects/%image_effect'] = array( 'title' => 'Edit image effect', @@ -151,7 +151,7 @@ function image_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('image_effect_form', 5, 7), 'access arguments' => array('administer image styles'), - 'file' => 'image.admin.inc', + 'file' => 'image.admin.inc.php', ); $items['admin/config/media/image-styles/edit/%image_style/effects/%image_effect/delete'] = array( 'title' => 'Delete image effect', @@ -160,7 +160,7 @@ function image_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('image_effect_delete_form', 5, 7), 'access arguments' => array('administer image styles'), - 'file' => 'image.admin.inc', + 'file' => 'image.admin.inc.php', ); $items['admin/config/media/image-styles/edit/%image_style/add/%image_effect_definition'] = array( 'title' => 'Add image effect', @@ -169,7 +169,7 @@ function image_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('image_effect_form', 5, 7), 'access arguments' => array('administer image styles'), - 'file' => 'image.admin.inc', + 'file' => 'image.admin.inc.php', ); return $items; @@ -818,7 +818,7 @@ function image_style_create_derivative($style, $source, $destination) { * pixels. */ function image_style_transform_dimensions($style_name, array &$dimensions) { - module_load_include('inc', 'image', 'image.effects'); + module_load_include('php', 'image', 'image.effects.inc'); $style = image_style_load($style_name); if (!is_array($style)) { @@ -985,7 +985,7 @@ function image_effect_definitions() { } else { $effects = array(); - include_once DRUPAL_ROOT . '/core/modules/image/image.effects.inc'; + include_once DRUPAL_ROOT . '/core/modules/image/image.effects.inc.php'; 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. @@ -1148,7 +1148,7 @@ function image_effect_delete($effect) { * TRUE on success. FALSE if unable to perform the image effect on the image. */ function image_effect_apply($image, $effect) { - module_load_include('inc', 'image', 'image.effects'); + module_load_include('php', 'image', 'image.effects.inc'); $function = $effect['effect callback']; if (function_exists($function)) { return $function($image, $effect['data']); diff --git a/core/modules/image/image.test b/core/modules/image/image.test index a29b4f3..f352285 100644 --- a/core/modules/image/image.test +++ b/core/modules/image/image.test @@ -229,7 +229,7 @@ class ImageEffectsUnitTest extends ImageToolkitTestCase { function setUp() { parent::setUp('image_test'); - module_load_include('inc', 'image', 'image.effects'); + module_load_include('php', 'image', 'image.effects.inc'); } /** diff --git a/core/modules/locale/locale.admin.inc.php b/core/modules/locale/locale.admin.inc.php index 82397c8..abd632d 100644 --- a/core/modules/locale/locale.admin.inc.php +++ b/core/modules/locale/locale.admin.inc.php @@ -361,7 +361,7 @@ function locale_languages_add_custom_form_submit($form, &$form_state) { function locale_languages_add_predefined_form_submit($form, &$form_state) { // Predefined language selection. $langcode = $form_state['values']['predefined_langcode']; - include_once DRUPAL_ROOT . '/core/includes/standard.inc'; + include_once DRUPAL_ROOT . '/core/includes/standard.inc.php'; $predefined = standard_language_list(); $language = (object) array( 'language' => $langcode, @@ -457,7 +457,7 @@ function locale_languages_delete_form_submit($form, &$form_state) { * Setting for language negotiation options */ function locale_languages_configure_form() { - include_once DRUPAL_ROOT . '/core/includes/language.inc'; + include_once DRUPAL_ROOT . '/core/includes/language.inc.php'; $form = array( '#submit' => array('locale_languages_configure_form_submit'), @@ -944,7 +944,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 . '/core/includes/locale.inc'; + include_once DRUPAL_ROOT . '/core/includes/locale.inc.php'; $langcode = $form_state['values']['langcode']; // Get list of date format types. diff --git a/core/modules/locale/locale.bulk.inc.php b/core/modules/locale/locale.bulk.inc.php index 45a31bd..0da1a45 100644 --- a/core/modules/locale/locale.bulk.inc.php +++ b/core/modules/locale/locale.bulk.inc.php @@ -5,7 +5,7 @@ * Mass import-export and batch import functionality for Gettext .po files. */ -include_once DRUPAL_ROOT . '/core/includes/gettext.inc'; +include_once DRUPAL_ROOT . '/core/includes/gettext.inc.php'; /** * User interface for the translation import screen. @@ -70,7 +70,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 . '/core/includes/standard.inc'; + include_once DRUPAL_ROOT . '/core/includes/standard.inc.php'; $predefined = standard_language_list(); $language = (object) array( 'language' => $langcode, @@ -209,7 +209,7 @@ function locale_translate_batch_build($files, $finish_feedback = FALSE) { 'title' => $t('Importing interface translations'), 'init_message' => $t('Starting import'), 'error_message' => $t('Error importing interface translations'), - 'file' => drupal_get_path('module', 'locale') . '/locale.bulk.inc', + 'file' => drupal_get_path('module', 'locale') . '/locale.bulk.inc.php', ); if ($finish_feedback) { $batch['finished'] = 'locale_translate_batch_finished'; diff --git a/core/modules/locale/locale.install b/core/modules/locale/locale.install index 77da39c..803670a 100644 --- a/core/modules/locale/locale.install +++ b/core/modules/locale/locale.install @@ -10,7 +10,7 @@ */ function locale_install() { // Add the default language to the database too. - include_once DRUPAL_ROOT . '/core/includes/locale.inc'; + include_once DRUPAL_ROOT . '/core/includes/locale.inc.php'; locale_language_save(language_default()); } diff --git a/core/modules/locale/locale.module.php b/core/modules/locale/locale.module.php index 18cf99d..159405f 100644 --- a/core/modules/locale/locale.module.php +++ b/core/modules/locale/locale.module.php @@ -83,7 +83,7 @@ function locale_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('locale_language_overview_form'), 'access arguments' => array('administer languages'), - 'file' => 'locale.admin.inc', + 'file' => 'locale.admin.inc.php', 'weight' => -10, ); $items['admin/config/regional/language/overview'] = array( @@ -98,7 +98,7 @@ function locale_menu() { 'access arguments' => array('administer languages'), 'weight' => 5, 'type' => MENU_LOCAL_ACTION, - 'file' => 'locale.admin.inc', + 'file' => 'locale.admin.inc.php', ); $items['admin/config/regional/language/configure'] = array( 'title' => 'Detection and selection', @@ -106,7 +106,7 @@ function locale_menu() { 'page arguments' => array('locale_languages_configure_form'), 'access arguments' => array('administer languages'), 'weight' => 10, - 'file' => 'locale.admin.inc', + 'file' => 'locale.admin.inc.php', 'type' => MENU_LOCAL_TASK, ); $items['admin/config/regional/language/configure/url'] = array( @@ -114,7 +114,7 @@ function locale_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('locale_language_providers_url_form'), 'access arguments' => array('administer languages'), - 'file' => 'locale.admin.inc', + 'file' => 'locale.admin.inc.php', 'type' => MENU_VISIBLE_IN_BREADCRUMB, ); $items['admin/config/regional/language/configure/session'] = array( @@ -122,7 +122,7 @@ function locale_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('locale_language_providers_session_form'), 'access arguments' => array('administer languages'), - 'file' => 'locale.admin.inc', + 'file' => 'locale.admin.inc.php', 'type' => MENU_VISIBLE_IN_BREADCRUMB, ); $items['admin/config/regional/language/edit/%language'] = array( @@ -130,14 +130,14 @@ function locale_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('locale_languages_edit_form', 5), 'access arguments' => array('administer languages'), - 'file' => 'locale.admin.inc', + 'file' => 'locale.admin.inc.php', ); $items['admin/config/regional/language/delete/%language'] = array( 'title' => 'Confirm', 'page callback' => 'drupal_get_form', 'page arguments' => array('locale_languages_delete_form', 5), 'access arguments' => array('administer languages'), - 'file' => 'locale.admin.inc', + 'file' => 'locale.admin.inc.php', ); // Translation functionality @@ -146,7 +146,7 @@ function locale_menu() { 'description' => 'Translate the built-in user interface.', 'page callback' => 'locale_translate_seek_screen', 'access arguments' => array('translate interface'), - 'file' => 'locale.pages.inc', + 'file' => 'locale.pages.inc.php', 'weight' => -5, ); $items['admin/config/regional/translate/translate'] = array( @@ -161,7 +161,7 @@ function locale_menu() { 'access arguments' => array('translate interface'), 'weight' => 20, 'type' => MENU_LOCAL_TASK, - 'file' => 'locale.bulk.inc', + 'file' => 'locale.bulk.inc.php', ); $items['admin/config/regional/translate/export'] = array( 'title' => 'Export', @@ -169,21 +169,21 @@ function locale_menu() { 'access arguments' => array('translate interface'), 'weight' => 30, 'type' => MENU_LOCAL_TASK, - 'file' => 'locale.bulk.inc', + 'file' => 'locale.bulk.inc.php', ); $items['admin/config/regional/translate/edit/%'] = array( 'title' => 'Edit string', 'page callback' => 'drupal_get_form', 'page arguments' => array('locale_translate_edit_form', 5), 'access arguments' => array('translate interface'), - 'file' => 'locale.pages.inc', + 'file' => 'locale.pages.inc.php', ); $items['admin/config/regional/translate/delete/%'] = array( 'title' => 'Delete string', 'page callback' => 'locale_translate_delete_page', 'page arguments' => array(5), 'access arguments' => array('translate interface'), - 'file' => 'locale.pages.inc', + 'file' => 'locale.pages.inc.php', ); // Localize date formats. @@ -194,7 +194,7 @@ function locale_menu() { 'access arguments' => array('administer site configuration'), 'type' => MENU_LOCAL_TASK, 'weight' => -8, - 'file' => 'locale.admin.inc', + 'file' => 'locale.admin.inc.php', ); $items['admin/config/regional/date-time/locale/%/edit'] = array( 'title' => 'Localize date formats', @@ -202,7 +202,7 @@ function locale_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('locale_date_format_form', 5), 'access arguments' => array('administer site configuration'), - 'file' => 'locale.admin.inc', + 'file' => 'locale.admin.inc.php', ); $items['admin/config/regional/date-time/locale/%/reset'] = array( 'title' => 'Reset date formats', @@ -210,7 +210,7 @@ function locale_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('locale_date_format_reset_form', 5), 'access arguments' => array('administer site configuration'), - 'file' => 'locale.admin.inc', + 'file' => 'locale.admin.inc.php', ); return $items; @@ -223,7 +223,7 @@ function locale_menu() { */ function locale_init() { global $conf, $language; - include_once DRUPAL_ROOT . '/core/includes/locale.inc'; + include_once DRUPAL_ROOT . '/core/includes/locale.inc.php'; // 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 @@ -410,11 +410,11 @@ function locale_theme() { return array( 'locale_language_overview_form_table' => array( 'render element' => 'form', - 'file' => 'locale.admin.inc', + 'file' => 'locale.admin.inc.php', ), 'locale_language_operations' => array( 'render element' => 'elements', - 'file' => 'locale.admin.inc', + 'file' => 'locale.admin.inc.php', ), 'locale_languages_configure_form' => array( 'render element' => 'form', @@ -467,7 +467,7 @@ function locale_field_language_fallback(&$display_language, $entity, $langcode) } elseif (!empty($entity->{$field_name})) { if (!isset($fallback_candidates)) { - require_once DRUPAL_ROOT . '/core/includes/language.inc'; + require_once DRUPAL_ROOT . '/core/includes/language.inc.php'; $fallback_candidates = language_fallback_get_candidates(); } foreach ($fallback_candidates as $fallback_language) { @@ -501,7 +501,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 . '/core/includes/locale.inc'; + require_once DRUPAL_ROOT . '/core/includes/locale.inc.php'; return array( LANGUAGE_TYPE_INTERFACE => array( 'name' => t('User interface text'), @@ -522,8 +522,8 @@ function locale_language_types_info() { * Implements hook_language_negotiation_info(). */ function locale_language_negotiation_info() { - require_once DRUPAL_ROOT . '/core/includes/locale.inc'; - $file = '/core/includes/locale.inc'; + require_once DRUPAL_ROOT . '/core/includes/locale.inc.php'; + $file = '/core/includes/locale.inc.php'; $providers = array(); $providers[LOCALE_LANGUAGE_NEGOTIATION_URL] = array( @@ -595,7 +595,7 @@ function locale_language_negotiation_info() { * Implements hook_modules_enabled(). */ function locale_modules_enabled($modules) { - include_once DRUPAL_ROOT . '/core/includes/language.inc'; + include_once DRUPAL_ROOT . '/core/includes/language.inc.php'; language_types_set(); language_negotiation_purge(); } @@ -884,7 +884,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 . '/core/includes/locale.inc'; + require_once DRUPAL_ROOT . '/core/includes/locale.inc.php'; foreach ($javascript as $item) { if ($item['type'] == 'file') { @@ -988,7 +988,7 @@ function locale_library_info_alter(&$libraries, $module) { * Implements hook_block_info(). */ function locale_block_info() { - include_once DRUPAL_ROOT . '/core/includes/language.inc'; + include_once DRUPAL_ROOT . '/core/includes/language.inc.php'; $block = array(); $info = language_types_info(); foreach (language_types_configurable(FALSE) as $type) { @@ -1038,7 +1038,7 @@ function locale_url_outbound_alter(&$path, &$options, $original_path) { if (!isset($callbacks)) { $callbacks = array(); - include_once DRUPAL_ROOT . '/core/includes/language.inc'; + include_once DRUPAL_ROOT . '/core/includes/language.inc.php'; 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 7506242..882a835 100644 --- a/core/modules/locale/locale.test +++ b/core/modules/locale/locale.test @@ -480,7 +480,7 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase { $this->drupalPost($url, $edit, t('Save translations')); // Trigger JavaScript translation parsing and building. - require_once DRUPAL_ROOT . '/core/includes/locale.inc'; + require_once DRUPAL_ROOT . '/core/includes/locale.inc.php'; _locale_rebuild_js($langcode); // Retrieve the JavaScript translation hash code for the custom language to @@ -1162,7 +1162,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 . '/core/includes/install.inc'; + require_once DRUPAL_ROOT . '/core/includes/install.inc.php'; } /** @@ -1204,7 +1204,7 @@ class LocaleUninstallFunctionalTest extends DrupalWebTestCase { $locale_module = array('locale'); // Add a new language and optionally set it as default. - require_once DRUPAL_ROOT . '/core/includes/locale.inc'; + require_once DRUPAL_ROOT . '/core/includes/locale.inc.php'; $language = (object) array( 'language' => 'fr', @@ -1270,7 +1270,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 . '/core/includes/language.inc'; + require_once DRUPAL_ROOT . '/core/includes/language.inc.php'; $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')))); @@ -1421,7 +1421,7 @@ class LocaleBrowserDetectionTest extends DrupalUnitTestCase { */ function testLanguageFromBrowser() { // Load the required functions. - require_once DRUPAL_ROOT . '/core/includes/locale.inc'; + require_once DRUPAL_ROOT . '/core/includes/locale.inc.php'; $languages = array( // In our test case, 'en' has priority over 'en-US'. @@ -1997,7 +1997,7 @@ class LocaleUILanguageNegotiationTest extends DrupalWebTestCase { function setUp() { parent::setUp('locale', 'locale_test'); - require_once DRUPAL_ROOT . '/core/includes/language.inc'; + require_once DRUPAL_ROOT . '/core/includes/language.inc.php'; drupal_load('module', 'locale'); $admin_user = $this->drupalCreateUser(array('administer languages', 'translate interface', 'access administration pages', 'administer blocks')); $this->drupalLogin($admin_user); @@ -2023,7 +2023,7 @@ class LocaleUILanguageNegotiationTest extends DrupalWebTestCase { $language_domain = 'example.cn'; // Setup the site languages by installing two languages. - require_once DRUPAL_ROOT . '/core/includes/locale.inc'; + require_once DRUPAL_ROOT . '/core/includes/locale.inc.php'; $language = (object) array( 'language' => $langcode_browser_fallback, ); @@ -2317,7 +2317,7 @@ class LocaleMultilingualFieldsFunctionalTest extends DrupalWebTestCase { $this->drupalLogin($admin_user); // Add a new language. - require_once DRUPAL_ROOT . '/core/includes/locale.inc'; + require_once DRUPAL_ROOT . '/core/includes/locale.inc.php'; $language = (object) array( 'language' => 'it', 'name' => 'Italian', @@ -2595,7 +2595,7 @@ class LocaleLanguageNegotiationInfoFunctionalTest extends DrupalWebTestCase { function setUp() { parent::setUp('locale'); - require_once DRUPAL_ROOT .'/core/includes/language.inc'; + require_once DRUPAL_ROOT .'/core/includes/language.inc.php'; $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages', 'view the administration theme')); $this->drupalLogin($admin_user); $this->drupalPost('admin/config/regional/language/add', array('predefined_langcode' => 'it'), t('Add language')); diff --git a/core/modules/menu/menu.module.php b/core/modules/menu/menu.module.php index cd42256..5a5a4c9 100644 --- a/core/modules/menu/menu.module.php +++ b/core/modules/menu/menu.module.php @@ -63,7 +63,7 @@ function menu_menu() { 'page callback' => 'menu_overview_page', 'access callback' => 'user_access', 'access arguments' => array('administer menu'), - 'file' => 'menu.admin.inc', + 'file' => 'menu.admin.inc.php', ); $items['admin/structure/menu/parents'] = array( 'title' => 'Parent menu items', @@ -82,7 +82,7 @@ function menu_menu() { 'page arguments' => array('menu_edit_menu', 'add'), 'access arguments' => array('administer menu'), 'type' => MENU_LOCAL_ACTION, - 'file' => 'menu.admin.inc', + 'file' => 'menu.admin.inc.php', ); $items['admin/structure/menu/settings'] = array( 'title' => 'Settings', @@ -91,7 +91,7 @@ function menu_menu() { 'access arguments' => array('administer menu'), 'type' => MENU_LOCAL_TASK, 'weight' => 5, - 'file' => 'menu.admin.inc', + 'file' => 'menu.admin.inc.php', ); $items['admin/structure/menu/manage/%menu'] = array( 'title' => 'Customize menu', @@ -100,7 +100,7 @@ function menu_menu() { 'title callback' => 'menu_overview_title', 'title arguments' => array(4), 'access arguments' => array('administer menu'), - 'file' => 'menu.admin.inc', + 'file' => 'menu.admin.inc.php', ); $items['admin/structure/menu/manage/%menu/list'] = array( 'title' => 'List links', @@ -114,7 +114,7 @@ function menu_menu() { 'page arguments' => array('menu_edit_item', 'add', NULL, 4), 'access arguments' => array('administer menu'), 'type' => MENU_LOCAL_ACTION, - 'file' => 'menu.admin.inc', + 'file' => 'menu.admin.inc.php', ); $items['admin/structure/menu/manage/%menu/edit'] = array( 'title' => 'Edit menu', @@ -123,35 +123,35 @@ function menu_menu() { 'access arguments' => array('administer menu'), 'type' => MENU_LOCAL_TASK, 'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE, - 'file' => 'menu.admin.inc', + 'file' => 'menu.admin.inc.php', ); $items['admin/structure/menu/manage/%menu/delete'] = array( 'title' => 'Delete menu', 'page callback' => 'menu_delete_menu_page', 'page arguments' => array(4), 'access arguments' => array('administer menu'), - 'file' => 'menu.admin.inc', + 'file' => 'menu.admin.inc.php', ); $items['admin/structure/menu/item/%menu_link/edit'] = array( 'title' => 'Edit menu link', 'page callback' => 'drupal_get_form', 'page arguments' => array('menu_edit_item', 'edit', 4, NULL), 'access arguments' => array('administer menu'), - 'file' => 'menu.admin.inc', + 'file' => 'menu.admin.inc.php', ); $items['admin/structure/menu/item/%menu_link/reset'] = array( 'title' => 'Reset menu link', 'page callback' => 'drupal_get_form', 'page arguments' => array('menu_reset_item_confirm', 4), 'access arguments' => array('administer menu'), - 'file' => 'menu.admin.inc', + 'file' => 'menu.admin.inc.php', ); $items['admin/structure/menu/item/%menu_link/delete'] = array( 'title' => 'Delete menu link', 'page callback' => 'menu_item_delete_page', 'page arguments' => array(4), 'access arguments' => array('administer menu'), - 'file' => 'menu.admin.inc', + 'file' => 'menu.admin.inc.php', ); return $items; } @@ -162,11 +162,11 @@ function menu_menu() { function menu_theme() { return array( 'menu_overview_form' => array( - 'file' => 'menu.admin.inc', + 'file' => 'menu.admin.inc.php', 'render element' => 'form', ), 'menu_admin_overview' => array( - 'file' => 'menu.admin.inc', + 'file' => 'menu.admin.inc.php', 'variables' => array('title' => NULL, 'name' => NULL, 'description' => NULL), ), ); diff --git a/core/modules/node/node.admin.inc.php b/core/modules/node/node.admin.inc.php index 8f46df4..954a65e 100644 --- a/core/modules/node/node.admin.inc.php +++ b/core/modules/node/node.admin.inc.php @@ -266,7 +266,7 @@ function node_mass_update($nodes, $updates) { 'error_message' => t('The update has encountered an error.'), // The operations do not live in the .module file, so we need to // tell the batch engine which file to load before calling them. - 'file' => drupal_get_path('module', 'node') . '/node.admin.inc', + 'file' => drupal_get_path('module', 'node') . '/node.admin.inc.php', ); batch_set($batch); } diff --git a/core/modules/node/node.module.php b/core/modules/node/node.module.php index 0c3cfb7..7c8693a 100644 --- a/core/modules/node/node.module.php +++ b/core/modules/node/node.module.php @@ -133,11 +133,11 @@ function node_theme() { ), 'node_add_list' => array( 'variables' => array('content' => NULL), - 'file' => 'node.pages.inc', + 'file' => 'node.pages.inc.php', ), 'node_preview' => array( 'variables' => array('node' => NULL), - 'file' => 'node.pages.inc', + 'file' => 'node.pages.inc.php', ), 'node_admin_overview' => array( 'variables' => array('name' => NULL, 'type' => NULL), @@ -1732,7 +1732,7 @@ function node_user_cancel($edit, $account, $method) { switch ($method) { case 'user_cancel_block_unpublish': // Unpublish nodes (current revisions). - module_load_include('inc', 'node', 'node.admin'); + module_load_include('php', 'node', 'node.admin.inc'); $nodes = db_select('node', 'n') ->fields('n', array('nid')) ->condition('uid', $account->uid) @@ -1743,7 +1743,7 @@ function node_user_cancel($edit, $account, $method) { case 'user_cancel_reassign': // Anonymize nodes (current revisions). - module_load_include('inc', 'node', 'node.admin'); + module_load_include('php', 'node', 'node.admin.inc'); $nodes = db_select('node', 'n') ->fields('n', array('nid')) ->condition('uid', $account->uid) @@ -1875,7 +1875,7 @@ function node_menu() { 'page arguments' => array('node_admin_content'), 'access arguments' => array('access content overview'), 'weight' => -10, - 'file' => 'node.admin.inc', + 'file' => 'node.admin.inc.php', ); $items['admin/content/node'] = array( 'title' => 'Content', @@ -1891,7 +1891,7 @@ function node_menu() { // has to be allowed access to the 'node access rebuild' confirm form. 'access arguments' => array('access administration pages'), 'type' => MENU_CALLBACK, - 'file' => 'node.admin.inc', + 'file' => 'node.admin.inc.php', ); $items['admin/structure/types'] = array( @@ -1899,7 +1899,7 @@ function node_menu() { 'description' => 'Manage content types, including default status, front page promotion, comment settings, etc.', 'page callback' => 'node_overview_types', 'access arguments' => array('administer content types'), - 'file' => 'content_types.inc', + 'file' => 'content_types.inc.php', ); $items['admin/structure/types/list'] = array( 'title' => 'List', @@ -1912,7 +1912,7 @@ function node_menu() { 'page arguments' => array('node_type_form'), 'access arguments' => array('administer content types'), 'type' => MENU_LOCAL_ACTION, - 'file' => 'content_types.inc', + 'file' => 'content_types.inc.php', ); $items['admin/structure/types/manage/%node_type'] = array( 'title' => 'Edit content type', @@ -1921,7 +1921,7 @@ function node_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('node_type_form', 4), 'access arguments' => array('administer content types'), - 'file' => 'content_types.inc', + 'file' => 'content_types.inc.php', ); $items['admin/structure/types/manage/%node_type/edit'] = array( 'title' => 'Edit', @@ -1931,7 +1931,7 @@ function node_menu() { 'title' => 'Delete', 'page arguments' => array('node_type_delete_confirm', 4), 'access arguments' => array('administer content types'), - 'file' => 'content_types.inc', + 'file' => 'content_types.inc.php', ); $items['node'] = array( @@ -1944,7 +1944,7 @@ function node_menu() { 'title' => 'Add content', 'page callback' => 'node_add_page', 'access callback' => '_node_add_access', - 'file' => 'node.pages.inc', + 'file' => 'node.pages.inc.php', ); $items['rss.xml'] = array( 'title' => 'RSS feed', @@ -1966,7 +1966,7 @@ function node_menu() { 'access callback' => 'node_access', 'access arguments' => array('create', $type->type), 'description' => $type->description, - 'file' => 'node.pages.inc', + 'file' => 'node.pages.inc.php', ); } $items['node/%node'] = array( @@ -1993,7 +1993,7 @@ function node_menu() { 'weight' => 0, 'type' => MENU_LOCAL_TASK, 'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE, - 'file' => 'node.pages.inc', + 'file' => 'node.pages.inc.php', ); $items['node/%node/delete'] = array( 'title' => 'Delete', @@ -2004,7 +2004,7 @@ function node_menu() { 'weight' => 1, 'type' => MENU_LOCAL_TASK, 'context' => MENU_CONTEXT_INLINE, - 'file' => 'node.pages.inc', + 'file' => 'node.pages.inc.php', ); $items['node/%node/revisions'] = array( 'title' => 'Revisions', @@ -2014,7 +2014,7 @@ function node_menu() { 'access arguments' => array(1), 'weight' => 2, 'type' => MENU_LOCAL_TASK, - 'file' => 'node.pages.inc', + 'file' => 'node.pages.inc.php', ); $items['node/%node/revisions/%/view'] = array( 'title' => 'Revisions', @@ -2031,7 +2031,7 @@ function node_menu() { 'page arguments' => array('node_revision_revert_confirm', 1), 'access callback' => '_node_revision_access', 'access arguments' => array(1, 'update'), - 'file' => 'node.pages.inc', + 'file' => 'node.pages.inc.php', ); $items['node/%node/revisions/%/delete'] = array( 'title' => 'Delete earlier revision', @@ -2040,7 +2040,7 @@ function node_menu() { 'page arguments' => array('node_revision_delete_confirm', 1), 'access callback' => '_node_revision_access', 'access arguments' => array(1, 'delete'), - 'file' => 'node.pages.inc', + 'file' => 'node.pages.inc.php', ); return $items; } diff --git a/core/modules/openid/openid.module.php b/core/modules/openid/openid.module.php index ed02891..6eff5f9 100644 --- a/core/modules/openid/openid.module.php +++ b/core/modules/openid/openid.module.php @@ -14,7 +14,7 @@ function openid_menu() { 'page callback' => 'openid_authentication_page', 'access callback' => 'user_is_anonymous', 'type' => MENU_CALLBACK, - 'file' => 'openid.pages.inc', + 'file' => 'openid.pages.inc.php', ); $items['user/%user/openid'] = array( 'title' => 'OpenID identities', @@ -23,7 +23,7 @@ function openid_menu() { 'access callback' => 'user_edit_access', 'access arguments' => array(1), 'type' => MENU_LOCAL_TASK, - 'file' => 'openid.pages.inc', + 'file' => 'openid.pages.inc.php', ); $items['user/%user/openid/delete'] = array( 'title' => 'Delete OpenID', @@ -31,7 +31,7 @@ function openid_menu() { 'page arguments' => array('openid_user_delete_form', 1), 'access callback' => 'user_edit_access', 'access arguments' => array(1), - 'file' => 'openid.pages.inc', + 'file' => 'openid.pages.inc.php', ); return $items; } @@ -181,7 +181,7 @@ function _openid_user_login_form_alter(&$form, &$form_state) { */ function openid_form_user_register_form_alter(&$form, &$form_state) { if (isset($_SESSION['openid']['response'])) { - module_load_include('inc', 'openid'); + module_load_include('php', 'openid', 'openid.inc'); $response = $_SESSION['openid']['response']; @@ -254,7 +254,7 @@ function openid_login_validate($form, &$form_state) { * @param $return_to The endpoint to return to from the OpenID Provider */ function openid_begin($claimed_id, $return_to = '', $form_values = array()) { - module_load_include('inc', 'openid'); + module_load_include('php', 'openid', 'openid.inc'); $service = NULL; $claimed_id = openid_normalize($claimed_id); @@ -321,7 +321,7 @@ function openid_begin($claimed_id, $return_to = '', $form_values = array()) { * $response['status'] set to one of 'success', 'failed' or 'cancel'. */ function openid_complete($response = array()) { - module_load_include('inc', 'openid'); + module_load_include('php', 'openid', 'openid.inc'); if (count($response) == 0) { $response = _openid_response(); @@ -406,7 +406,7 @@ function openid_complete($response = array()) { * found, FALSE is returned. */ function openid_discovery($claimed_id) { - module_load_include('inc', 'openid'); + module_load_include('php', 'openid', 'openid.inc'); $methods = module_invoke_all('openid_discovery_method_info'); drupal_alter('openid_discovery_method_info', $methods); @@ -583,7 +583,7 @@ function openid_openid_normalization_method_info() { * @return $assoc_handle The association handle. */ function openid_association($op_endpoint) { - module_load_include('inc', 'openid'); + module_load_include('php', 'openid', 'openid.inc'); // Remove Old Associations: db_delete('openid_association') @@ -708,7 +708,7 @@ function openid_authentication($response) { } function openid_association_request($public) { - module_load_include('inc', 'openid'); + module_load_include('php', 'openid', 'openid.inc'); $request = array( 'openid.ns' => OPENID_NS_2_0, @@ -728,7 +728,7 @@ function openid_association_request($public) { function openid_authentication_request($claimed_id, $identity, $return_to = '', $assoc_handle = '', $service) { global $base_url; - module_load_include('inc', 'openid'); + module_load_include('php', 'openid', 'openid.inc'); $request = array( 'openid.mode' => 'checkid_setup', @@ -790,7 +790,7 @@ function openid_authentication_request($claimed_id, $identity, $return_to = '', * @see http://openid.net/specs/openid-authentication-2_0.html#rfc.section.11.4 */ function openid_verify_assertion($service, $response) { - module_load_include('inc', 'openid'); + module_load_include('php', 'openid', 'openid.inc'); // http://openid.net/specs/openid-authentication-2_0.html#rfc.section.11.3 // Check the Nonce to protect against replay attacks. diff --git a/core/modules/openid/openid.test b/core/modules/openid/openid.test index d873c32..5c16364 100644 --- a/core/modules/openid/openid.test +++ b/core/modules/openid/openid.test @@ -549,7 +549,7 @@ class OpenIDUnitTest extends DrupalWebTestCase { function setUp() { parent::setUp('openid'); - module_load_include('inc', 'openid'); + module_load_include('php', 'openid', 'openid.inc'); } /** diff --git a/core/modules/openid/tests/openid_test.install b/core/modules/openid/tests/openid_test.install index 3bd4978..91c1331 100644 --- a/core/modules/openid/tests/openid_test.install +++ b/core/modules/openid/tests/openid_test.install @@ -9,7 +9,7 @@ * Implements hook_install(). */ function openid_test_install() { - module_load_include('inc', 'openid'); + module_load_include('php', 'openid', 'openid.inc'); // Generate a MAC key (Message Authentication Code) used for signing messages. // The variable is base64-encoded, because variables cannot contain non-UTF-8 // data. diff --git a/core/modules/openid/tests/openid_test.module.php b/core/modules/openid/tests/openid_test.module.php index 629dcd3..6abf53c 100644 --- a/core/modules/openid/tests/openid_test.module.php +++ b/core/modules/openid/tests/openid_test.module.php @@ -258,7 +258,7 @@ function openid_test_redirected_method($method1, $method2) { * the endpoint using drupal_http_request()). */ function _openid_test_endpoint_associate() { - module_load_include('inc', 'openid'); + module_load_include('php', 'openid', 'openid.inc'); // Use default parameters for Diffie-Helmann key exchange. $mod = OPENID_DH_DEFAULT_MOD; @@ -307,7 +307,7 @@ function _openid_test_endpoint_associate() { * identity. */ function _openid_test_endpoint_authenticate() { - module_load_include('inc', 'openid'); + module_load_include('php', 'openid', 'openid.inc'); $expected_identity = variable_get('openid_test_identity'); if ($expected_identity && $_REQUEST['openid_identity'] != $expected_identity) { diff --git a/core/modules/path/path.module.php b/core/modules/path/path.module.php index 332287d..5d29274 100644 --- a/core/modules/path/path.module.php +++ b/core/modules/path/path.module.php @@ -58,21 +58,21 @@ function path_menu() { 'page callback' => 'path_admin_overview', 'access arguments' => array('administer url aliases'), 'weight' => -5, - 'file' => 'path.admin.inc', + 'file' => 'path.admin.inc.php', ); $items['admin/config/search/path/edit/%path'] = array( 'title' => 'Edit alias', 'page callback' => 'path_admin_edit', 'page arguments' => array(5), 'access arguments' => array('administer url aliases'), - 'file' => 'path.admin.inc', + 'file' => 'path.admin.inc.php', ); $items['admin/config/search/path/delete/%path'] = array( 'title' => 'Delete alias', 'page callback' => 'drupal_get_form', 'page arguments' => array('path_admin_delete_confirm', 5), 'access arguments' => array('administer url aliases'), - 'file' => 'path.admin.inc', + 'file' => 'path.admin.inc.php', ); $items['admin/config/search/path/list'] = array( 'title' => 'List', @@ -84,7 +84,7 @@ function path_menu() { 'page callback' => 'path_admin_edit', 'access arguments' => array('administer url aliases'), 'type' => MENU_LOCAL_ACTION, - 'file' => 'path.admin.inc', + 'file' => 'path.admin.inc.php', ); return $items; diff --git a/core/modules/poll/poll.module.php b/core/modules/poll/poll.module.php index ec5452e..1357b20 100644 --- a/core/modules/poll/poll.module.php +++ b/core/modules/poll/poll.module.php @@ -92,7 +92,7 @@ function poll_menu() { 'page callback' => 'poll_page', 'access arguments' => array('access content'), 'type' => MENU_SUGGESTED_ITEM, - 'file' => 'poll.pages.inc', + 'file' => 'poll.pages.inc.php', ); $items['node/%node/votes'] = array( @@ -103,7 +103,7 @@ function poll_menu() { 'access arguments' => array(1, 'inspect all votes', FALSE), 'weight' => 3, 'type' => MENU_LOCAL_TASK, - 'file' => 'poll.pages.inc', + 'file' => 'poll.pages.inc.php', ); $items['node/%node/results'] = array( @@ -114,7 +114,7 @@ function poll_menu() { 'access arguments' => array(1, 'access content', TRUE), 'weight' => 3, 'type' => MENU_LOCAL_TASK, - 'file' => 'poll.pages.inc', + 'file' => 'poll.pages.inc.php', ); return $items; diff --git a/core/modules/search/search.module.php b/core/modules/search/search.module.php index e731e4f..b606fcd 100644 --- a/core/modules/search/search.module.php +++ b/core/modules/search/search.module.php @@ -103,12 +103,12 @@ function search_theme() { return array( 'search_result' => array( 'variables' => array('result' => NULL, 'module' => NULL), - 'file' => 'search.pages.inc', + 'file' => 'search.pages.inc.php', 'template' => 'search-result', ), 'search_results' => array( 'variables' => array('results' => NULL, 'module' => NULL), - 'file' => 'search.pages.inc', + 'file' => 'search.pages.inc.php', 'template' => 'search-results', ), ); @@ -171,7 +171,7 @@ function search_menu() { 'page callback' => 'search_view', 'access callback' => 'search_is_active', 'type' => MENU_SUGGESTED_ITEM, - 'file' => 'search.pages.inc', + 'file' => 'search.pages.inc.php', ); $items['admin/config/search/settings'] = array( 'title' => 'Search settings', @@ -180,7 +180,7 @@ function search_menu() { 'page arguments' => array('search_admin_settings'), 'access arguments' => array('administer search'), 'weight' => -10, - 'file' => 'search.admin.inc', + 'file' => 'search.admin.inc.php', ); $items['admin/config/search/settings/reindex'] = array( 'title' => 'Clear index', @@ -188,7 +188,7 @@ function search_menu() { 'page arguments' => array('search_reindex_confirm'), 'access arguments' => array('administer search'), 'type' => MENU_VISIBLE_IN_BREADCRUMB, - 'file' => 'search.admin.inc', + 'file' => 'search.admin.inc.php', ); // Add paths for searching. We add each module search path twice: once without @@ -210,7 +210,7 @@ function search_menu() { 'access callback' => '_search_menu_access', 'access arguments' => array($module), 'type' => MENU_LOCAL_TASK, - 'file' => 'search.pages.inc', + 'file' => 'search.pages.inc.php', 'weight' => $module == $default_info['module'] ? -10 : 0, ); $items["$path/%menu_tail"] = array( @@ -223,7 +223,7 @@ function search_menu() { // The default local task points to its parent, but this item points to // where it should so it should not be changed. 'type' => MENU_LOCAL_TASK, - 'file' => 'search.pages.inc', + 'file' => 'search.pages.inc.php', 'weight' => 0, // These tabs are not subtabs. 'tab_root' => 'search/' . $default_info['path'] . '/%', diff --git a/core/modules/shortcut/shortcut.module.php b/core/modules/shortcut/shortcut.module.php index f8ddcc2..84b3c05 100644 --- a/core/modules/shortcut/shortcut.module.php +++ b/core/modules/shortcut/shortcut.module.php @@ -72,7 +72,7 @@ function shortcut_menu() { 'description' => 'Add and modify shortcut sets.', 'page callback' => 'shortcut_set_admin', 'access arguments' => array('administer shortcuts'), - 'file' => 'shortcut.admin.inc', + 'file' => 'shortcut.admin.inc.php', ); $items['admin/config/user-interface/shortcut/add-set'] = array( 'title' => 'Add shortcut set', @@ -80,7 +80,7 @@ function shortcut_menu() { 'page arguments' => array('shortcut_set_add_form'), 'access arguments' => array('administer shortcuts'), 'type' => MENU_LOCAL_ACTION, - 'file' => 'shortcut.admin.inc', + 'file' => 'shortcut.admin.inc.php', ); $items['admin/config/user-interface/shortcut/%shortcut_set'] = array( 'title' => 'Edit shortcuts', @@ -90,7 +90,7 @@ function shortcut_menu() { 'title arguments' => array(4), 'access callback' => 'shortcut_set_edit_access', 'access arguments' => array(4), - 'file' => 'shortcut.admin.inc', + 'file' => 'shortcut.admin.inc.php', ); $items['admin/config/user-interface/shortcut/%shortcut_set/links'] = array( 'title' => 'List links', @@ -103,7 +103,7 @@ function shortcut_menu() { 'access callback' => 'shortcut_set_edit_access', 'access arguments' => array(4), 'type' => MENU_LOCAL_TASK, - 'file' => 'shortcut.admin.inc', + 'file' => 'shortcut.admin.inc.php', 'weight' => 10, ); $items['admin/config/user-interface/shortcut/%shortcut_set/delete'] = array( @@ -112,7 +112,7 @@ function shortcut_menu() { 'page arguments' => array('shortcut_set_delete_form', 4), 'access callback' => 'shortcut_set_delete_access', 'access arguments' => array(4), - 'file' => 'shortcut.admin.inc', + 'file' => 'shortcut.admin.inc.php', ); $items['admin/config/user-interface/shortcut/%shortcut_set/add-link'] = array( 'title' => 'Add shortcut', @@ -121,7 +121,7 @@ function shortcut_menu() { 'access callback' => 'shortcut_set_edit_access', 'access arguments' => array(4), 'type' => MENU_LOCAL_ACTION, - 'file' => 'shortcut.admin.inc', + 'file' => 'shortcut.admin.inc.php', ); $items['admin/config/user-interface/shortcut/%shortcut_set/add-link-inline'] = array( 'title' => 'Add shortcut', @@ -130,7 +130,7 @@ function shortcut_menu() { 'access callback' => 'shortcut_set_edit_access', 'access arguments' => array(4), 'type' => MENU_CALLBACK, - 'file' => 'shortcut.admin.inc', + 'file' => 'shortcut.admin.inc.php', ); $items['admin/config/user-interface/shortcut/link/%menu_link'] = array( 'title' => 'Edit shortcut', @@ -138,7 +138,7 @@ function shortcut_menu() { 'page arguments' => array('shortcut_link_edit', 5), 'access callback' => 'shortcut_link_access', 'access arguments' => array(5), - 'file' => 'shortcut.admin.inc', + 'file' => 'shortcut.admin.inc.php', ); $items['admin/config/user-interface/shortcut/link/%menu_link/delete'] = array( 'title' => 'Delete shortcut', @@ -146,7 +146,7 @@ function shortcut_menu() { 'page arguments' => array('shortcut_link_delete', 5), 'access callback' => 'shortcut_link_access', 'access arguments' => array(5), - 'file' => 'shortcut.admin.inc', + 'file' => 'shortcut.admin.inc.php', ); $items['user/%user/shortcuts'] = array( 'title' => 'Shortcuts', @@ -155,7 +155,7 @@ function shortcut_menu() { 'access callback' => 'shortcut_set_switch_access', 'access arguments' => array(1), 'type' => MENU_LOCAL_TASK, - 'file' => 'shortcut.admin.inc', + 'file' => 'shortcut.admin.inc.php', ); return $items; @@ -178,7 +178,7 @@ function shortcut_theme() { return array( 'shortcut_set_customize' => array( 'render element' => 'form', - 'file' => 'shortcut.admin.inc', + 'file' => 'shortcut.admin.inc.php', ), ); } diff --git a/core/modules/simpletest/drupal_web_test_case.php b/core/modules/simpletest/drupal_web_test_case.php index 9d993d4..5b0d073 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 . '/core/includes/errors.inc'; + require_once DRUPAL_ROOT . '/core/includes/errors.inc.php'; // 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)); } @@ -1294,7 +1294,7 @@ class DrupalWebTestCase extends DrupalTestCase { $test_info['test_run_id'] = $this->databasePrefix; $test_info['in_child_site'] = FALSE; - include_once DRUPAL_ROOT . '/core/includes/install.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc.php'; drupal_install_system(); $this->preloadRegistry(); diff --git a/core/modules/simpletest/simpletest.module.php b/core/modules/simpletest/simpletest.module.php index eb33d1b..991cd0e 100644 --- a/core/modules/simpletest/simpletest.module.php +++ b/core/modules/simpletest/simpletest.module.php @@ -34,7 +34,7 @@ function simpletest_menu() { 'page arguments' => array('simpletest_test_form'), 'description' => 'Run tests against Drupal core and your modules. These tests help assure that your site code is working as designed.', 'access arguments' => array('administer unit tests'), - 'file' => 'simpletest.pages.inc', + 'file' => 'simpletest.pages.inc.php', 'weight' => -5, ); $items['admin/config/development/testing/list'] = array( @@ -47,7 +47,7 @@ function simpletest_menu() { 'page arguments' => array('simpletest_settings_form'), 'access arguments' => array('administer unit tests'), 'type' => MENU_LOCAL_TASK, - 'file' => 'simpletest.pages.inc', + 'file' => 'simpletest.pages.inc.php', ); $items['admin/config/development/testing/results/%'] = array( 'title' => 'Test result', @@ -55,7 +55,7 @@ function simpletest_menu() { 'page arguments' => array('simpletest_result_form', 5), 'description' => 'View result of tests.', 'access arguments' => array('administer unit tests'), - 'file' => 'simpletest.pages.inc', + 'file' => 'simpletest.pages.inc.php', ); return $items; } @@ -79,11 +79,11 @@ function simpletest_theme() { return array( 'simpletest_test_table' => array( 'render element' => 'table', - 'file' => 'simpletest.pages.inc', + 'file' => 'simpletest.pages.inc.php', ), 'simpletest_result_summary' => array( 'render element' => 'form', - 'file' => 'simpletest.pages.inc', + 'file' => 'simpletest.pages.inc.php', ), ); } diff --git a/core/modules/simpletest/tests/batch.test b/core/modules/simpletest/tests/batch.test index 1e9b31b..67d78e0 100644 --- a/core/modules/simpletest/tests/batch.test +++ b/core/modules/simpletest/tests/batch.test @@ -379,7 +379,7 @@ class BatchPercentagesUnitTestCase extends DrupalUnitTestCase { '80' => array('total' => 1, 'current' => 400/501), '99.8' => array('total' => 1, 'current' => 500/501), ); - require_once DRUPAL_ROOT . '/core/includes/batch.inc'; + require_once DRUPAL_ROOT . '/core/includes/batch.inc.php'; parent::setUp(); } diff --git a/core/modules/simpletest/tests/batch_test.module.php b/core/modules/simpletest/tests/batch_test.module.php index 1200e76..8463777 100644 --- a/core/modules/simpletest/tests/batch_test.module.php +++ b/core/modules/simpletest/tests/batch_test.module.php @@ -340,7 +340,7 @@ function _batch_test_batch_0() { $batch = array( 'operations' => array(), 'finished' => '_batch_test_finished_0', - 'file' => drupal_get_path('module', 'batch_test'). '/batch_test.callbacks.inc', + 'file' => drupal_get_path('module', 'batch_test'). '/batch_test.callbacks.inc.php', ); return $batch; } @@ -362,7 +362,7 @@ function _batch_test_batch_1() { $batch = array( 'operations' => $operations, 'finished' => '_batch_test_finished_1', - 'file' => drupal_get_path('module', 'batch_test'). '/batch_test.callbacks.inc', + 'file' => drupal_get_path('module', 'batch_test'). '/batch_test.callbacks.inc.php', ); return $batch; } @@ -383,7 +383,7 @@ function _batch_test_batch_2() { $batch = array( 'operations' => $operations, 'finished' => '_batch_test_finished_2', - 'file' => drupal_get_path('module', 'batch_test') . '/batch_test.callbacks.inc', + 'file' => drupal_get_path('module', 'batch_test') . '/batch_test.callbacks.inc.php', ); return $batch; } @@ -414,7 +414,7 @@ function _batch_test_batch_3() { $batch = array( 'operations' => $operations, 'finished' => '_batch_test_finished_3', - 'file' => drupal_get_path('module', 'batch_test') . '/batch_test.callbacks.inc', + 'file' => drupal_get_path('module', 'batch_test') . '/batch_test.callbacks.inc.php', ); return $batch; } @@ -443,7 +443,7 @@ function _batch_test_batch_4() { $batch = array( 'operations' => $operations, 'finished' => '_batch_test_finished_4', - 'file' => drupal_get_path('module', 'batch_test') . '/batch_test.callbacks.inc', + 'file' => drupal_get_path('module', 'batch_test') . '/batch_test.callbacks.inc.php', ); return $batch; } @@ -465,7 +465,7 @@ function _batch_test_batch_5() { $batch = array( 'operations' => $operations, 'finished' => '_batch_test_finished_5', - 'file' => drupal_get_path('module', 'batch_test'). '/batch_test.callbacks.inc', + 'file' => drupal_get_path('module', 'batch_test'). '/batch_test.callbacks.inc.php', ); return $batch; } diff --git a/core/modules/simpletest/tests/bootstrap.test b/core/modules/simpletest/tests/bootstrap.test index 5829222..9d6ab1a 100644 --- a/core/modules/simpletest/tests/bootstrap.test +++ b/core/modules/simpletest/tests/bootstrap.test @@ -342,7 +342,7 @@ class BootstrapGetFilenameTestCase extends DrupalUnitTestCase { drupal_static_reset('drupal_get_filename'); // Retrieving the location of a module. - $this->assertIdentical(drupal_get_filename('module', 'php'), 'core/modules/php/php.module', t('Retrieve module location.')); + $this->assertIdentical(drupal_get_filename('module', 'php'), 'core/modules/php/php.module.php', t('Retrieve module location.')); // Retrieving the location of a theme. $this->assertIdentical(drupal_get_filename('theme', 'stark'), 'core/themes/stark/stark.info', t('Retrieve theme location.')); diff --git a/core/modules/simpletest/tests/error.test b/core/modules/simpletest/tests/error.test index 8c5a848..3bfcbb2 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('core/modules/simpletest/tests/error_test.module'), + '%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module.php'), ); $error_warning = array( '%type' => 'Warning', '!message' => 'Division by zero', '%function' => 'error_test_generate_warnings()', - '%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module'), + '%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module.php'), ); $error_user_notice = array( '%type' => 'User warning', '!message' => 'Drupal is awesome', '%function' => 'error_test_generate_warnings()', - '%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module'), + '%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module.php'), ); // 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('core/modules/simpletest/tests/error_test.module'), + '%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module.php'), ); $error_pdo_exception = array( '%type' => 'PDOException', '!message' => 'SELECT * FROM bananas_are_awesome', '%function' => 'error_test_trigger_pdo_exception()', '%line' => 65, - '%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module'), + '%file' => drupal_realpath('core/modules/simpletest/tests/error_test.module.php'), ); $this->drupalGet('error-test/trigger-exception'); diff --git a/core/modules/simpletest/tests/form_test.module.php b/core/modules/simpletest/tests/form_test.module.php index 0393b18..b92aefb 100644 --- a/core/modules/simpletest/tests/form_test.module.php +++ b/core/modules/simpletest/tests/form_test.module.php @@ -181,7 +181,7 @@ function form_test_menu() { 'access callback' => 'node_access', 'access arguments' => array('create', 'page'), 'file path' => drupal_get_path('module', 'node'), - 'file' => 'node.pages.inc', + 'file' => 'node.pages.inc.php', 'type' => MENU_CALLBACK, ); } @@ -191,7 +191,7 @@ function form_test_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('form_test_load_include_menu'), 'access callback' => TRUE, - 'file' => 'form_test.file.inc', + 'file' => 'form_test.file.inc.php', 'type' => MENU_CALLBACK, ); diff --git a/core/modules/simpletest/tests/graph.test b/core/modules/simpletest/tests/graph.test index e60cd39..506d835 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 . '/core/includes/graph.inc'; + require_once DRUPAL_ROOT . '/core/includes/graph.inc.php'; parent::setUp(); } diff --git a/core/modules/simpletest/tests/https.php b/core/modules/simpletest/tests/https.php index c342abc..9cbd820 100644 --- a/core/modules/simpletest/tests/https.php +++ b/core/modules/simpletest/tests/https.php @@ -18,7 +18,7 @@ foreach ($_SERVER as $key => $value) { // Change current directory to the Drupal root. chdir('../../../..'); define('DRUPAL_ROOT', getcwd()); -require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; +require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc.php'; // Make sure this file can only be used by simpletest. drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION); diff --git a/core/modules/simpletest/tests/module.test b/core/modules/simpletest/tests/module.test index c9601c9..88d6a06 100644 --- a/core/modules/simpletest/tests/module.test +++ b/core/modules/simpletest/tests/module.test @@ -103,7 +103,7 @@ class ModuleUnitTest extends DrupalWebTestCase { // For that activate the module_test which provides the file to load. module_enable(array('module_test')); - module_load_include('inc', 'module_test', 'module_test.file'); + module_load_include('php', 'module_test', 'module_test.file.inc'); $modules = module_implements('test_hook'); $static = drupal_static('module_implements'); $this->assertTrue(in_array('module_test', $modules), 'Hook found.'); diff --git a/core/modules/simpletest/tests/password.test b/core/modules/simpletest/tests/password.test index e0139e9..c700aa8 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', 'core/includes/password.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc.php'); parent::setUp(); } diff --git a/core/modules/simpletest/tests/update.test b/core/modules/simpletest/tests/update.test index abbab47..f363584 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 . '/core/includes/update.inc'; + require_once DRUPAL_ROOT . '/core/includes/update.inc.php'; } /** @@ -99,7 +99,7 @@ class UpdateDependencyHookInvocationTestCase extends DrupalWebTestCase { function setUp() { parent::setUp('update_test_1', 'update_test_2'); - require_once DRUPAL_ROOT . '/core/includes/update.inc'; + require_once DRUPAL_ROOT . '/core/includes/update.inc.php'; } /** diff --git a/core/modules/simpletest/tests/upgrade/upgrade.test b/core/modules/simpletest/tests/upgrade/upgrade.test index ffb3a55..81ab79f 100644 --- a/core/modules/simpletest/tests/upgrade/upgrade.test +++ b/core/modules/simpletest/tests/upgrade/upgrade.test @@ -42,7 +42,7 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase { } // Load the Update API. - require_once DRUPAL_ROOT . '/core/includes/update.inc'; + require_once DRUPAL_ROOT . '/core/includes/update.inc.php'; // Reset flags. $this->upgradedSite = FALSE; diff --git a/core/modules/statistics/statistics.module.php b/core/modules/statistics/statistics.module.php index 6f01535..afaed80 100644 --- a/core/modules/statistics/statistics.module.php +++ b/core/modules/statistics/statistics.module.php @@ -77,7 +77,7 @@ function statistics_exit() { drupal_bootstrap(DRUPAL_BOOTSTRAP_SESSION); // For anonymous users unicode.inc will not have been loaded. - include_once DRUPAL_ROOT . '/core/includes/unicode.inc'; + include_once DRUPAL_ROOT . '/core/includes/unicode.inc.php'; // Log this page access. db_insert('accesslog') ->fields(array( @@ -139,7 +139,7 @@ function statistics_menu() { 'description' => 'View pages that have recently been visited.', 'page callback' => 'statistics_recent_hits', 'access arguments' => array('access statistics'), - 'file' => 'statistics.admin.inc', + 'file' => 'statistics.admin.inc.php', ); $items['admin/reports/pages'] = array( 'title' => 'Top pages', @@ -147,7 +147,7 @@ function statistics_menu() { 'page callback' => 'statistics_top_pages', 'access arguments' => array('access statistics'), 'weight' => 1, - 'file' => 'statistics.admin.inc', + 'file' => 'statistics.admin.inc.php', ); $items['admin/reports/visitors'] = array( 'title' => 'Top visitors', @@ -155,14 +155,14 @@ function statistics_menu() { 'page callback' => 'statistics_top_visitors', 'access arguments' => array('access statistics'), 'weight' => 2, - 'file' => 'statistics.admin.inc', + 'file' => 'statistics.admin.inc.php', ); $items['admin/reports/referrers'] = array( 'title' => 'Top referrers', 'description' => 'View top referrers.', 'page callback' => 'statistics_top_referrers', 'access arguments' => array('access statistics'), - 'file' => 'statistics.admin.inc', + 'file' => 'statistics.admin.inc.php', ); $items['admin/reports/access/%'] = array( 'title' => 'Details', @@ -170,7 +170,7 @@ function statistics_menu() { 'page callback' => 'statistics_access_log', 'page arguments' => array(3), 'access arguments' => array('access statistics'), - 'file' => 'statistics.admin.inc', + 'file' => 'statistics.admin.inc.php', ); $items['admin/config/system/statistics'] = array( 'title' => 'Statistics', @@ -178,7 +178,7 @@ function statistics_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('statistics_settings_form'), 'access arguments' => array('administer statistics'), - 'file' => 'statistics.admin.inc', + 'file' => 'statistics.admin.inc.php', 'weight' => -15, ); $items['user/%user/track/navigation'] = array( @@ -188,7 +188,7 @@ function statistics_menu() { 'access arguments' => array('access statistics'), 'type' => MENU_LOCAL_TASK, 'weight' => 2, - 'file' => 'statistics.pages.inc', + 'file' => 'statistics.pages.inc.php', ); $items['node/%node/track'] = array( 'title' => 'Track', @@ -197,7 +197,7 @@ function statistics_menu() { 'access arguments' => array('access statistics'), 'type' => MENU_LOCAL_TASK, 'weight' => 2, - 'file' => 'statistics.pages.inc', + 'file' => 'statistics.pages.inc.php', ); return $items; diff --git a/core/modules/system/system.admin.inc.php b/core/modules/system/system.admin.inc.php index a5a8885..f1bd47b 100644 --- a/core/modules/system/system.admin.inc.php +++ b/core/modules/system/system.admin.inc.php @@ -790,7 +790,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 . '/core/includes/install.inc'; + require_once DRUPAL_ROOT . '/core/includes/install.inc.php'; $distribution_name = check_plain(drupal_install_profile_distribution_name()); // Iterate through each of the modules. @@ -1059,7 +1059,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 . '/core/includes/install.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc.php'; // Builds list of modules. $modules = array(); @@ -1208,7 +1208,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 . '/core/includes/install.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc.php'; // 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'])) { @@ -1321,7 +1321,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 . '/core/includes/install.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc.php'; if (!empty($form['#confirmed'])) { // Call the uninstall routine for each selected module. @@ -1867,7 +1867,7 @@ function system_rss_feeds_settings() { * @see system_regional_settings_submit() */ function system_regional_settings() { - include_once DRUPAL_ROOT . '/core/includes/locale.inc'; + include_once DRUPAL_ROOT . '/core/includes/locale.inc.php'; $countries = country_get_list(); // Date settings: @@ -2272,7 +2272,7 @@ function system_clean_url_settings($form, &$form_state) { */ function system_status($check = FALSE) { // Load .install files - include_once DRUPAL_ROOT . '/core/includes/install.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc.php'; drupal_load_updates(); // Check run-time requirements and status information. @@ -2320,7 +2320,7 @@ function system_php() { * Default page callback for batches. */ function system_batch_page() { - require_once DRUPAL_ROOT . '/core/includes/batch.inc'; + require_once DRUPAL_ROOT . '/core/includes/batch.inc.php'; $output = _batch_page(); if ($output === FALSE) { diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php index ed2a8bf..b258839 100644 --- a/core/modules/system/system.api.php +++ b/core/modules/system/system.api.php @@ -1675,11 +1675,11 @@ function hook_theme($existing, $type, $theme, $path) { ), 'status_report' => array( 'render element' => 'requirements', - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ), 'system_date_time_settings' => array( 'render element' => 'form', - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ), ); } @@ -1705,7 +1705,7 @@ function hook_theme($existing, $type, $theme, $path) { * 'account' => NULL, * ), * 'template' => 'core/modules/user/user-profile', - * 'file' => 'core/modules/user/user.pages.inc', + * 'file' => 'core/modules/user/user.pages.inc.php', * 'type' => 'module', * 'theme path' => 'core/modules/user', * 'preprocess functions' => array( @@ -4101,7 +4101,7 @@ function hook_menu_site_status_alter(&$menu_site_status, $path) { function hook_filetransfer_info() { $info['sftp'] = array( 'title' => t('SFTP (Secure FTP)'), - 'file' => 'sftp.filetransfer.inc', + 'file' => 'sftp.filetransfer.inc.php', 'class' => 'FileTransferSFTP', 'weight' => 10, ); diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 6f81509..35f3554 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -447,7 +447,7 @@ function system_requirements($phase) { } // Test Unicode library - include_once DRUPAL_ROOT . '/core/includes/unicode.inc'; + include_once DRUPAL_ROOT . '/core/includes/unicode.inc.php'; $requirements = array_merge($requirements, unicode_requirements()); if ($phase == 'runtime') { diff --git a/core/modules/system/system.module.php b/core/modules/system/system.module.php index 27e20b5..37021cb 100644 --- a/core/modules/system/system.module.php +++ b/core/modules/system/system.module.php @@ -148,7 +148,7 @@ function system_theme() { return array_merge(drupal_common_theme(), array( 'system_themes_page' => array( 'variables' => array('theme_groups' => NULL), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ), 'system_settings_form' => array( 'render element' => 'form', @@ -158,35 +158,35 @@ function system_theme() { ), 'system_modules_fieldset' => array( 'render element' => 'form', - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ), 'system_modules_incompatible' => array( 'variables' => array('message' => NULL), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ), 'system_modules_uninstall' => array( 'render element' => 'form', - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ), 'status_report' => array( 'render element' => 'requirements', - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ), 'admin_page' => array( 'variables' => array('blocks' => NULL), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ), 'admin_block' => array( 'variables' => array('block' => NULL), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ), 'admin_block_content' => array( 'variables' => array('content' => NULL), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ), 'system_admin_index' => array( 'variables' => array('menu_items' => NULL), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ), 'system_powered_by' => array( 'variables' => array(), @@ -196,7 +196,7 @@ function system_theme() { ), 'system_date_time_settings' => array( 'render element' => 'form', - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ), )); } @@ -538,14 +538,14 @@ function system_menu() { 'theme callback' => 'ajax_base_page_theme', 'type' => MENU_CALLBACK, 'file path' => 'core/includes', - 'file' => 'form.inc', + 'file' => 'form.inc.php', ); $items['system/timezone'] = array( 'title' => 'Time zone', 'page callback' => 'system_timezone', 'access callback' => TRUE, 'type' => MENU_CALLBACK, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin'] = array( 'title' => 'Administration', @@ -553,14 +553,14 @@ function system_menu() { 'page callback' => 'system_admin_menu_block_page', 'weight' => 9, 'menu_name' => 'management', - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/compact'] = array( 'title' => 'Compact mode', 'page callback' => 'system_admin_compact_page', 'access arguments' => array('access administration pages'), 'type' => MENU_CALLBACK, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/tasks'] = array( 'title' => 'Tasks', @@ -573,7 +573,7 @@ function system_menu() { 'access arguments' => array('access administration pages'), 'type' => MENU_LOCAL_TASK, 'weight' => -18, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); // Menu items that are basically just menu blocks. @@ -584,7 +584,7 @@ function system_menu() { 'weight' => -8, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); // Appearance. $items['admin/appearance'] = array( @@ -594,35 +594,35 @@ function system_menu() { 'access arguments' => array('administer themes'), 'position' => 'left', 'weight' => -6, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/appearance/list'] = array( 'title' => 'List', 'description' => 'Select and configure your theme', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -1, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/appearance/enable'] = array( 'title' => 'Enable theme', 'page callback' => 'system_theme_enable', 'access arguments' => array('administer themes'), 'type' => MENU_CALLBACK, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/appearance/disable'] = array( 'title' => 'Disable theme', 'page callback' => 'system_theme_disable', 'access arguments' => array('administer themes'), 'type' => MENU_CALLBACK, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/appearance/default'] = array( 'title' => 'Set default theme', 'page callback' => 'system_theme_default', 'access arguments' => array('administer themes'), 'type' => MENU_CALLBACK, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/appearance/settings'] = array( 'title' => 'Settings', @@ -631,7 +631,7 @@ function system_menu() { 'page arguments' => array('system_theme_settings'), 'access arguments' => array('administer themes'), 'type' => MENU_LOCAL_TASK, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', 'weight' => 20, ); // Theme configuration subtabs. @@ -648,7 +648,7 @@ function system_menu() { 'type' => MENU_LOCAL_TASK, 'access callback' => '_system_themes_access', 'access arguments' => array($key), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); } @@ -659,7 +659,7 @@ function system_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('system_modules'), 'access arguments' => array('administer modules'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', 'weight' => -2, ); $items['admin/modules/list'] = array( @@ -676,14 +676,14 @@ function system_menu() { 'page arguments' => array('system_modules_uninstall'), 'access arguments' => array('administer modules'), 'type' => MENU_LOCAL_TASK, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', 'weight' => 20, ); $items['admin/modules/uninstall/confirm'] = array( 'title' => 'Uninstall', 'access arguments' => array('administer modules'), 'type' => MENU_VISIBLE_IN_BREADCRUMB, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); // Configuration. @@ -692,7 +692,7 @@ function system_menu() { 'description' => 'Administer settings.', 'page callback' => 'system_admin_config_page', 'access arguments' => array('access administration pages'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); // IP address blocking. @@ -701,7 +701,7 @@ function system_menu() { 'description' => 'Manage blocked IP addresses.', 'page callback' => 'system_ip_blocking', 'access arguments' => array('block IP addresses'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', 'weight' => 10, ); $items['admin/config/people/ip-blocking/delete/%blocked_ip'] = array( @@ -709,7 +709,7 @@ function system_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('system_ip_blocking_delete', 5), 'access arguments' => array('block IP addresses'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); // Media settings. @@ -720,7 +720,7 @@ function system_menu() { 'weight' => -10, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/media/file-system'] = array( 'title' => 'File system', @@ -729,7 +729,7 @@ function system_menu() { 'page arguments' => array('system_file_system_settings'), 'access arguments' => array('administer site configuration'), 'weight' => -10, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/media/image-toolkit'] = array( 'title' => 'Image toolkit', @@ -738,7 +738,7 @@ function system_menu() { 'page arguments' => array('system_image_toolkit_settings'), 'access arguments' => array('administer site configuration'), 'weight' => 20, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); // Service settings. @@ -749,7 +749,7 @@ function system_menu() { 'weight' => 0, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/services/rss-publishing'] = array( 'title' => 'RSS publishing', @@ -757,7 +757,7 @@ function system_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('system_rss_feeds_settings'), 'access arguments' => array('administer site configuration'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); // Development settings. @@ -768,7 +768,7 @@ function system_menu() { 'weight' => -10, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/development/maintenance'] = array( 'title' => 'Maintenance mode', @@ -776,7 +776,7 @@ function system_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('system_site_maintenance_mode'), 'access arguments' => array('administer site configuration'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', 'weight' => -10, ); $items['admin/config/development/performance'] = array( @@ -785,7 +785,7 @@ function system_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('system_performance_settings'), 'access arguments' => array('administer site configuration'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', 'weight' => -20, ); $items['admin/config/development/logging'] = array( @@ -794,7 +794,7 @@ function system_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('system_logging_settings'), 'access arguments' => array('administer site configuration'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', 'weight' => -15, ); @@ -806,7 +806,7 @@ function system_menu() { 'weight' => -5, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/regional/settings'] = array( 'title' => 'Regional settings', @@ -815,7 +815,7 @@ function system_menu() { 'page arguments' => array('system_regional_settings'), 'access arguments' => array('administer site configuration'), 'weight' => -20, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/regional/date-time'] = array( 'title' => 'Date and time', @@ -824,7 +824,7 @@ function system_menu() { 'page arguments' => array('system_date_time_settings'), 'access arguments' => array('administer site configuration'), 'weight' => -15, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/regional/date-time/types'] = array( 'title' => 'Types', @@ -834,7 +834,7 @@ function system_menu() { 'access arguments' => array('administer site configuration'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/regional/date-time/types/add'] = array( 'title' => 'Add date type', @@ -844,7 +844,7 @@ function system_menu() { 'access arguments' => array('administer site configuration'), 'type' => MENU_LOCAL_ACTION, 'weight' => -10, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/regional/date-time/types/%/delete'] = array( 'title' => 'Delete date type', @@ -852,7 +852,7 @@ function system_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('system_delete_date_format_type_form', 5), 'access arguments' => array('administer site configuration'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/regional/date-time/formats'] = array( 'title' => 'Formats', @@ -861,7 +861,7 @@ function system_menu() { 'access arguments' => array('administer site configuration'), 'type' => MENU_LOCAL_TASK, 'weight' => -9, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/regional/date-time/formats/add'] = array( 'title' => 'Add format', @@ -871,7 +871,7 @@ function system_menu() { 'page arguments' => array('system_configure_date_formats_form'), 'access arguments' => array('administer site configuration'), 'weight' => -10, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/regional/date-time/formats/%/edit'] = array( 'title' => 'Edit date format', @@ -879,7 +879,7 @@ function system_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('system_configure_date_formats_form', 5), 'access arguments' => array('administer site configuration'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/regional/date-time/formats/%/delete'] = array( 'title' => 'Delete date format', @@ -887,14 +887,14 @@ function system_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('system_date_delete_format_form', 5), 'access arguments' => array('administer site configuration'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/regional/date-time/formats/lookup'] = array( 'title' => 'Date and time lookup', 'page callback' => 'system_date_time_lookup', 'access arguments' => array('administer site configuration'), 'type' => MENU_CALLBACK, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); // Search settings. @@ -905,7 +905,7 @@ function system_menu() { 'weight' => -10, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/search/clean-urls'] = array( 'title' => 'Clean URLs', @@ -913,7 +913,7 @@ function system_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('system_clean_url_settings'), 'access arguments' => array('administer site configuration'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', 'weight' => 5, ); $items['admin/config/search/clean-urls/check'] = array( @@ -922,7 +922,7 @@ function system_menu() { 'page arguments' => array(array('status' => TRUE)), 'access callback' => TRUE, 'type' => MENU_CALLBACK, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); // System settings. @@ -933,14 +933,14 @@ function system_menu() { 'weight' => -20, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/system/actions'] = array( 'title' => 'Actions', 'description' => 'Manage the actions defined for your site.', 'access arguments' => array('administer actions'), 'page callback' => 'system_actions_manage', - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/system/actions/manage'] = array( 'title' => 'Manage actions', @@ -948,7 +948,7 @@ function system_menu() { 'page callback' => 'system_actions_manage', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -2, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/system/actions/configure'] = array( 'title' => 'Configure an advanced action', @@ -956,7 +956,7 @@ function system_menu() { 'page arguments' => array('system_actions_configure'), 'access arguments' => array('administer actions'), 'type' => MENU_VISIBLE_IN_BREADCRUMB, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/system/actions/delete/%actions'] = array( 'title' => 'Delete action', @@ -964,14 +964,14 @@ function system_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('system_actions_delete_form', 5), 'access arguments' => array('administer actions'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/system/actions/orphan'] = array( 'title' => 'Remove orphans', 'page callback' => 'system_actions_remove_orphans', 'access arguments' => array('administer actions'), 'type' => MENU_CALLBACK, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/system/site-information'] = array( 'title' => 'Site information', @@ -979,7 +979,7 @@ function system_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('system_site_information_settings'), 'access arguments' => array('administer site configuration'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', 'weight' => -20, ); $items['admin/config/system/cron'] = array( @@ -988,7 +988,7 @@ function system_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('system_cron_settings'), 'access arguments' => array('administer site configuration'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', 'weight' => 20, ); // Additional categories @@ -998,7 +998,7 @@ function system_menu() { 'position' => 'right', 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', 'weight' => -15, ); $items['admin/config/workflow'] = array( @@ -1008,7 +1008,7 @@ function system_menu() { 'weight' => 5, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/config/content'] = array( 'title' => 'Content authoring', @@ -1017,7 +1017,7 @@ function system_menu() { 'weight' => -15, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); // Reports. @@ -1028,7 +1028,7 @@ function system_menu() { 'access arguments' => array('access site reports'), 'weight' => 5, 'position' => 'left', - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/reports/status'] = array( 'title' => 'Status report', @@ -1036,21 +1036,21 @@ function system_menu() { 'page callback' => 'system_status', 'weight' => -60, 'access arguments' => array('administer site configuration'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/reports/status/run-cron'] = array( 'title' => 'Run cron', 'page callback' => 'system_run_cron', 'access arguments' => array('administer site configuration'), 'type' => MENU_CALLBACK, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); $items['admin/reports/status/php'] = array( 'title' => 'PHP', 'page callback' => 'system_php', 'access arguments' => array('administer site configuration'), 'type' => MENU_CALLBACK, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); // Default page for batch operations. @@ -1059,7 +1059,7 @@ function system_menu() { 'access callback' => TRUE, 'theme callback' => '_system_batch_theme', 'type' => MENU_CALLBACK, - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', ); return $items; } @@ -1071,7 +1071,7 @@ function _system_batch_theme() { // Retrieve the current state of the batch. $batch = &batch_get(); if (!$batch && isset($_REQUEST['id'])) { - require_once DRUPAL_ROOT . '/core/includes/batch.inc'; + require_once DRUPAL_ROOT . '/core/includes/batch.inc.php'; $batch = batch_load($_REQUEST['id']); } // Use the same theme as the page that started the batch. @@ -1856,7 +1856,7 @@ function system_filetransfer_info() { $backends['ftp'] = array( 'title' => t('FTP'), 'class' => 'FileTransferFTP', - 'file' => 'ftp.inc', + 'file' => 'ftp.inc.php', 'file path' => 'core/includes/filetransfer', 'weight' => 0, ); @@ -1868,7 +1868,7 @@ function system_filetransfer_info() { $backends['ssh'] = array( 'title' => t('SSH'), 'class' => 'FileTransferSSH', - 'file' => 'ssh.inc', + 'file' => 'ssh.inc.php', 'file path' => 'core/includes/filetransfer', 'weight' => 20, ); diff --git a/core/modules/system/system.test b/core/modules/system/system.test index 6cf203d..944a548 100644 --- a/core/modules/system/system.test +++ b/core/modules/system/system.test @@ -2118,7 +2118,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', 'core/includes/password.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc.php'); $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.php b/core/modules/system/system.updater.inc.php index 84c1752..4599c5e 100644 --- a/core/modules/system/system.updater.inc.php +++ b/core/modules/system/system.updater.inc.php @@ -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 . '/core/includes/install.inc'; - require_once DRUPAL_ROOT . '/core/includes/update.inc'; + require_once DRUPAL_ROOT . '/core/includes/install.inc.php'; + require_once DRUPAL_ROOT . '/core/includes/update.inc.php'; if (_update_get_project_type($project) != 'module') { return array(); diff --git a/core/modules/taxonomy/taxonomy.module.php b/core/modules/taxonomy/taxonomy.module.php index eb20c26..62e05ad 100644 --- a/core/modules/taxonomy/taxonomy.module.php +++ b/core/modules/taxonomy/taxonomy.module.php @@ -263,7 +263,7 @@ function taxonomy_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('taxonomy_overview_vocabularies'), 'access arguments' => array('administer taxonomy'), - 'file' => 'taxonomy.admin.inc', + 'file' => 'taxonomy.admin.inc.php', ); $items['admin/structure/taxonomy/list'] = array( 'title' => 'List', @@ -276,7 +276,7 @@ function taxonomy_menu() { 'page arguments' => array('taxonomy_form_vocabulary'), 'access arguments' => array('administer taxonomy'), 'type' => MENU_LOCAL_ACTION, - 'file' => 'taxonomy.admin.inc', + 'file' => 'taxonomy.admin.inc.php', ); $items['taxonomy/term/%taxonomy_term'] = array( @@ -286,7 +286,7 @@ function taxonomy_menu() { 'page callback' => 'taxonomy_term_page', 'page arguments' => array(2), 'access arguments' => array('access content'), - 'file' => 'taxonomy.pages.inc', + 'file' => 'taxonomy.pages.inc.php', ); $items['taxonomy/term/%taxonomy_term/view'] = array( 'title' => 'View', @@ -300,7 +300,7 @@ function taxonomy_menu() { 'access arguments' => array(2), 'type' => MENU_LOCAL_TASK, 'weight' => 10, - 'file' => 'taxonomy.admin.inc', + 'file' => 'taxonomy.admin.inc.php', ); $items['taxonomy/term/%taxonomy_term/feed'] = array( 'title' => 'Taxonomy term', @@ -310,14 +310,14 @@ function taxonomy_menu() { 'page arguments' => array(2), 'access arguments' => array('access content'), 'type' => MENU_CALLBACK, - 'file' => 'taxonomy.pages.inc', + 'file' => 'taxonomy.pages.inc.php', ); $items['taxonomy/autocomplete'] = array( 'title' => 'Autocomplete taxonomy', 'page callback' => 'taxonomy_autocomplete', 'access arguments' => array('access content'), 'type' => MENU_CALLBACK, - 'file' => 'taxonomy.pages.inc', + 'file' => 'taxonomy.pages.inc.php', ); $items['admin/structure/taxonomy/%taxonomy_vocabulary_machine_name'] = array( @@ -326,7 +326,7 @@ function taxonomy_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('taxonomy_overview_terms', 3), 'access arguments' => array('administer taxonomy'), - 'file' => 'taxonomy.admin.inc', + 'file' => 'taxonomy.admin.inc.php', ); $items['admin/structure/taxonomy/%taxonomy_vocabulary_machine_name/list'] = array( 'title' => 'List', @@ -340,7 +340,7 @@ function taxonomy_menu() { 'access arguments' => array('administer taxonomy'), 'type' => MENU_LOCAL_TASK, 'weight' => -10, - 'file' => 'taxonomy.admin.inc', + 'file' => 'taxonomy.admin.inc.php', ); $items['admin/structure/taxonomy/%taxonomy_vocabulary_machine_name/add'] = array( @@ -349,7 +349,7 @@ function taxonomy_menu() { 'page arguments' => array('taxonomy_form_term', array(), 3), 'access arguments' => array('administer taxonomy'), 'type' => MENU_LOCAL_ACTION, - 'file' => 'taxonomy.admin.inc', + 'file' => 'taxonomy.admin.inc.php', ); return $items; diff --git a/core/modules/taxonomy/taxonomy.test b/core/modules/taxonomy/taxonomy.test index 747d822..34602e4 100644 --- a/core/modules/taxonomy/taxonomy.test +++ b/core/modules/taxonomy/taxonomy.test @@ -370,7 +370,7 @@ class TaxonomyVocabularyUnitTest extends TaxonomyWebTestCase { module_disable(array('taxonomy')); drupal_flush_all_caches(); - require_once DRUPAL_ROOT . '/core/includes/install.inc'; + require_once DRUPAL_ROOT . '/core/includes/install.inc.php'; drupal_uninstall_modules(array('taxonomy')); module_enable(array('taxonomy')); diff --git a/core/modules/tracker/tracker.module.php b/core/modules/tracker/tracker.module.php index 227cf72..a5630e7 100644 --- a/core/modules/tracker/tracker.module.php +++ b/core/modules/tracker/tracker.module.php @@ -35,7 +35,7 @@ function tracker_menu() { 'page callback' => 'tracker_page', 'access arguments' => array('access content'), 'weight' => 1, - 'file' => 'tracker.pages.inc', + 'file' => 'tracker.pages.inc.php', ); $items['tracker/all'] = array( 'title' => 'All recent content', @@ -48,7 +48,7 @@ function tracker_menu() { 'access arguments' => array(1), 'page arguments' => array(1), 'type' => MENU_LOCAL_TASK, - 'file' => 'tracker.pages.inc', + 'file' => 'tracker.pages.inc.php', ); $items['user/%user/track'] = array( @@ -58,7 +58,7 @@ function tracker_menu() { 'access callback' => '_tracker_user_access', 'access arguments' => array(1), 'type' => MENU_LOCAL_TASK, - 'file' => 'tracker.pages.inc', + 'file' => 'tracker.pages.inc.php', ); $items['user/%user/track/content'] = array( 'title' => 'Track content', diff --git a/core/modules/translation/translation.module.php b/core/modules/translation/translation.module.php index 7d47a6d..fad8d60 100644 --- a/core/modules/translation/translation.module.php +++ b/core/modules/translation/translation.module.php @@ -64,7 +64,7 @@ function translation_menu() { 'access arguments' => array(1), 'type' => MENU_LOCAL_TASK, 'weight' => 2, - 'file' => 'translation.pages.inc', + 'file' => 'translation.pages.inc.php', ); return $items; } diff --git a/core/modules/translation/translation.pages.inc.php b/core/modules/translation/translation.pages.inc.php index 8c09850..b2e822a 100644 --- a/core/modules/translation/translation.pages.inc.php +++ b/core/modules/translation/translation.pages.inc.php @@ -12,7 +12,7 @@ * Node object. */ function translation_node_overview($node) { - include_once DRUPAL_ROOT . '/core/includes/language.inc'; + include_once DRUPAL_ROOT . '/core/includes/language.inc.php'; if ($node->tnid) { // Already part of a set, grab that set. diff --git a/core/modules/trigger/trigger.module.php b/core/modules/trigger/trigger.module.php index c0e516f..9598a8f 100644 --- a/core/modules/trigger/trigger.module.php +++ b/core/modules/trigger/trigger.module.php @@ -46,7 +46,7 @@ function trigger_menu() { 'description' => 'Configure when to execute actions.', 'page callback' => 'trigger_assign', 'access arguments' => array('administer actions'), - 'file' => 'trigger.admin.inc', + 'file' => 'trigger.admin.inc.php', ); $trigger_info = _trigger_tab_information(); @@ -57,7 +57,7 @@ function trigger_menu() { 'page arguments' => array($module), 'access arguments' => array('administer actions'), 'type' => MENU_LOCAL_TASK, - 'file' => 'trigger.admin.inc', + 'file' => 'trigger.admin.inc.php', ); } @@ -67,7 +67,7 @@ function trigger_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('trigger_unassign'), 'access arguments' => array('administer actions'), - 'file' => 'trigger.admin.inc', + 'file' => 'trigger.admin.inc.php', ); return $items; @@ -176,7 +176,7 @@ function trigger_theme() { return array( 'trigger_display' => array( 'render element' => 'element', - 'file' => 'trigger.admin.inc', + 'file' => 'trigger.admin.inc.php', ), ); } diff --git a/core/modules/update/update.authorize.inc.php b/core/modules/update/update.authorize.inc.php index 35dde0e..e693eff 100644 --- a/core/modules/update/update.authorize.inc.php +++ b/core/modules/update/update.authorize.inc.php @@ -41,7 +41,7 @@ function update_authorize_run_update($filetransfer, $projects) { 'init_message' => t('Preparing to update your site'), 'operations' => $operations, 'finished' => 'update_authorize_update_batch_finished', - 'file' => drupal_get_path('module', 'update') . '/update.authorize.inc', + 'file' => drupal_get_path('module', 'update') . '/update.authorize.inc.php', ); batch_set($batch); @@ -81,7 +81,7 @@ function update_authorize_run_install($filetransfer, $project, $updater_name, $l 'operations' => $operations, // @todo Use a different finished callback for different messages? 'finished' => 'update_authorize_install_batch_finished', - 'file' => drupal_get_path('module', 'update') . '/update.authorize.inc', + 'file' => drupal_get_path('module', 'update') . '/update.authorize.inc.php', ); batch_set($batch); diff --git a/core/modules/update/update.fetch.inc.php b/core/modules/update/update.fetch.inc.php index 7ac0dbe..e25d59e 100644 --- a/core/modules/update/update.fetch.inc.php +++ b/core/modules/update/update.fetch.inc.php @@ -18,7 +18,7 @@ function update_manual_status() { 'title' => t('Checking available update data'), 'progress_message' => t('Trying to check available update data ...'), 'error_message' => t('Error checking available update data.'), - 'file' => drupal_get_path('module', 'update') . '/update.fetch.inc', + 'file' => drupal_get_path('module', 'update') . '/update.fetch.inc.php', ); batch_set($batch); batch_process('admin/reports/updates'); @@ -187,7 +187,7 @@ function _update_process_fetch_task($project) { * Clear out all the cached available update data and initiate re-fetching. */ function _update_refresh() { - module_load_include('inc', 'update', 'update.compare'); + module_load_include('php', 'update', 'update.compare.inc'); // Since we're fetching new available update data, we want to clear // our cache of both the projects we care about, and the current update diff --git a/core/modules/update/update.install b/core/modules/update/update.install index f0d5499..e0a042b 100644 --- a/core/modules/update/update.install +++ b/core/modules/update/update.install @@ -30,7 +30,7 @@ function update_requirements($phase) { $requirements = array(); if ($phase == 'runtime') { if ($available = update_get_available(FALSE)) { - module_load_include('inc', 'update', 'update.compare'); + module_load_include('php', 'update', 'update.compare.inc'); $data = update_calculate_project_data($available); // First, populate the requirements for core: $requirements['update_core'] = _update_requirement_check($data['drupal'], 'core'); diff --git a/core/modules/update/update.manager.inc.php b/core/modules/update/update.manager.inc.php index 59858eb..6d12db5 100644 --- a/core/modules/update/update.manager.inc.php +++ b/core/modules/update/update.manager.inc.php @@ -85,7 +85,7 @@ function update_manager_update_form($form, $form_state = array(), $context) { // project in the form, regardless of if it's enabled or disabled. $form['project_downloads'] = array('#tree' => TRUE); - module_load_include('inc', 'update', 'update.compare'); + module_load_include('php', 'update', 'update.compare.inc'); $project_data = update_calculate_project_data($available); foreach ($project_data as $name => $project) { // Filter out projects which are up to date already. @@ -323,7 +323,7 @@ function update_manager_update_form_submit($form, &$form_state) { 'init_message' => t('Preparing to download selected updates'), 'operations' => $operations, 'finished' => 'update_manager_download_batch_finished', - 'file' => drupal_get_path('module', 'update') . '/update.manager.inc', + 'file' => drupal_get_path('module', 'update') . '/update.manager.inc.php', ); batch_set($batch); } @@ -435,7 +435,7 @@ function update_manager_update_ready_form_submit($form, &$form_state) { // credentials. Instead, we instantiate a FileTransferLocal and invoke // update_authorize_run_update() directly. if (fileowner($project_real_location) == fileowner(conf_path())) { - module_load_include('inc', 'update', 'update.authorize'); + module_load_include('php', 'update', 'update.authorize.inc'); $filetransfer = new FileTransferLocal(DRUPAL_ROOT); update_authorize_run_update($filetransfer, $updates); } @@ -710,7 +710,7 @@ function update_manager_install_form_submit($form, &$form_state) { // credentials. Instead, we instantiate a FileTransferLocal and invoke // update_authorize_run_install() directly. if (fileowner($project_real_location) == fileowner(conf_path())) { - module_load_include('inc', 'update', 'update.authorize'); + module_load_include('php', 'update', 'update.authorize.inc'); $filetransfer = new FileTransferLocal(DRUPAL_ROOT); call_user_func_array('update_authorize_run_install', array_merge(array($filetransfer), $arguments)); } diff --git a/core/modules/update/update.module.php b/core/modules/update/update.module.php index 6da47c0..7636f9d 100644 --- a/core/modules/update/update.module.php +++ b/core/modules/update/update.module.php @@ -168,7 +168,7 @@ function update_menu() { 'page callback' => 'update_status', 'access arguments' => array('administer site configuration'), 'weight' => -50, - 'file' => 'update.report.inc', + 'file' => 'update.report.inc.php', ); $items['admin/reports/updates/list'] = array( 'title' => 'List', @@ -180,7 +180,7 @@ function update_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('update_settings'), 'access arguments' => array('administer site configuration'), - 'file' => 'update.settings.inc', + 'file' => 'update.settings.inc.php', 'type' => MENU_LOCAL_TASK, 'weight' => 50, ); @@ -189,7 +189,7 @@ function update_menu() { 'page callback' => 'update_manual_status', 'access arguments' => array('administer site configuration'), 'type' => MENU_CALLBACK, - 'file' => 'update.fetch.inc', + 'file' => 'update.fetch.inc.php', ); // We want action links for updating projects at a few different locations: @@ -211,7 +211,7 @@ function update_menu() { 'access arguments' => array(), 'weight' => 25, 'type' => MENU_LOCAL_ACTION, - 'file' => 'update.manager.inc', + 'file' => 'update.manager.inc.php', ); $items[$path . '/update'] = array( 'page callback' => 'drupal_get_form', @@ -221,7 +221,7 @@ function update_menu() { 'weight' => 10, 'title' => 'Update', 'type' => MENU_LOCAL_TASK, - 'file' => 'update.manager.inc', + 'file' => 'update.manager.inc.php', ); } // Customize the titles of the action links depending on where they appear. @@ -239,7 +239,7 @@ function update_menu() { 'access callback' => 'update_manager_access', 'access arguments' => array(), 'type' => MENU_CALLBACK, - 'file' => 'update.manager.inc', + 'file' => 'update.manager.inc.php', ); return $items; @@ -265,7 +265,7 @@ function update_theme() { return array( 'update_manager_update_form' => array( 'render element' => 'form', - 'file' => 'update.manager.inc', + 'file' => 'update.manager.inc.php', ), 'update_last_check' => array( 'variables' => array('last' => NULL), @@ -377,7 +377,7 @@ function _update_no_data() { * @see update_get_projects() */ function update_get_available($refresh = FALSE) { - module_load_include('inc', 'update', 'update.compare'); + module_load_include('php', 'update', 'update.compare.inc'); $needs_refresh = FALSE; // Grab whatever data we currently have cached in the DB. @@ -433,7 +433,7 @@ function update_get_available($refresh = FALSE) { * @see _update_create_fetch_task() */ function update_create_fetch_task($project) { - module_load_include('inc', 'update', 'update.fetch'); + module_load_include('php', 'update', 'update.fetch.inc'); return _update_create_fetch_task($project); } @@ -443,7 +443,7 @@ function update_create_fetch_task($project) { * @see _update_refresh() */ function update_refresh() { - module_load_include('inc', 'update', 'update.fetch'); + module_load_include('php', 'update', 'update.fetch.inc'); return _update_refresh(); } @@ -451,7 +451,7 @@ function update_refresh() { * Wrapper to load the include file and then attempt to fetch update data. */ function update_fetch_data() { - module_load_include('inc', 'update', 'update.fetch'); + module_load_include('php', 'update', 'update.fetch.inc'); return _update_fetch_data(); } @@ -663,9 +663,9 @@ function update_verify_update_archive($project, $archive_file, $directory) { if ( file_exists("$directory/$project/index.php") && 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") + && file_exists("$directory/$project/core/includes/bootstrap.inc.php") + && file_exists("$directory/$project/core/modules/node/node.module.php") + && file_exists("$directory/$project/core/modules/system/system.module.php") ) { 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/update/update.report.inc.php b/core/modules/update/update.report.inc.php index 02150e9..7ef3023 100644 --- a/core/modules/update/update.report.inc.php +++ b/core/modules/update/update.report.inc.php @@ -10,7 +10,7 @@ */ function update_status() { if ($available = update_get_available(TRUE)) { - module_load_include('inc', 'update', 'update.compare'); + module_load_include('php', 'update', 'update.compare.inc'); $data = update_calculate_project_data($available); return theme('update_report', array('data' => $data)); } diff --git a/core/modules/user/user.admin.inc.php b/core/modules/user/user.admin.inc.php index 4789e7e..9d50688 100644 --- a/core/modules/user/user.admin.inc.php +++ b/core/modules/user/user.admin.inc.php @@ -318,7 +318,7 @@ function user_admin_settings() { '#default_value' => variable_get('user_email_verification', TRUE), '#description' => t('New users will be required to validate their e-mail address prior to logging into the site, and will be assigned a system-generated password. With this setting disabled, users will be logged in immediately upon registering, and may select their own passwords during registration.') ); - module_load_include('inc', 'user', 'user.pages'); + module_load_include('php', 'user', 'user.pages.inc'); $form['registration_cancellation']['user_cancel_method'] = array( '#type' => 'item', '#title' => t('When cancelling a user account'), diff --git a/core/modules/user/user.api.php b/core/modules/user/user.api.php index 8cf788c..e6b5396 100644 --- a/core/modules/user/user.api.php +++ b/core/modules/user/user.api.php @@ -79,7 +79,7 @@ function hook_user_cancel($edit, $account, $method) { switch ($method) { case 'user_cancel_block_unpublish': // Unpublish nodes (current revisions). - module_load_include('inc', 'node', 'node.admin'); + module_load_include('php', 'node', 'node.admin.inc'); $nodes = db_select('node', 'n') ->fields('n', array('nid')) ->condition('uid', $account->uid) @@ -90,7 +90,7 @@ function hook_user_cancel($edit, $account, $method) { case 'user_cancel_reassign': // Anonymize nodes (current revisions). - module_load_include('inc', 'node', 'node.admin'); + module_load_include('php', 'node', 'node.admin.inc'); $nodes = db_select('node', 'n') ->fields('n', array('nid')) ->condition('uid', $account->uid) diff --git a/core/modules/user/user.module.php b/core/modules/user/user.module.php index b22d30f..57659eb 100644 --- a/core/modules/user/user.module.php +++ b/core/modules/user/user.module.php @@ -112,22 +112,22 @@ function user_theme() { 'user_profile' => array( 'render element' => 'elements', 'template' => 'user-profile', - 'file' => 'user.pages.inc', + 'file' => 'user.pages.inc.php', ), 'user_list' => array( 'variables' => array('users' => NULL, 'title' => NULL), ), 'user_admin_permissions' => array( 'render element' => 'form', - 'file' => 'user.admin.inc', + 'file' => 'user.admin.inc.php', ), 'user_admin_roles' => array( 'render element' => 'form', - 'file' => 'user.admin.inc', + 'file' => 'user.admin.inc.php', ), 'user_permission_description' => array( 'variables' => array('permission_item' => NULL, 'hide' => NULL), - 'file' => 'user.admin.inc', + 'file' => 'user.admin.inc.php', ), 'user_signature' => array( 'variables' => array('signature' => NULL), @@ -378,7 +378,7 @@ function user_save($account, $edit = array()) { try { if (!empty($edit['pass'])) { // Allow alternate password hashing schemes. - require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc.php'); $edit['pass'] = user_hash_password(trim($edit['pass'])); // Abort if the hashing failed and returned FALSE. if (!$edit['pass']) { @@ -1114,7 +1114,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', 'core/includes/password.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc.php'); $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))); @@ -1487,7 +1487,7 @@ function user_menu() { 'access callback' => 'user_access', 'access arguments' => array('access user profiles'), 'type' => MENU_CALLBACK, - 'file' => 'user.pages.inc', + 'file' => 'user.pages.inc.php', ); // Registration and login pages. @@ -1496,7 +1496,7 @@ function user_menu() { 'title callback' => 'user_menu_title', 'page callback' => 'user_page', 'access callback' => TRUE, - 'file' => 'user.pages.inc', + 'file' => 'user.pages.inc.php', 'weight' => -10, 'menu_name' => 'user-menu', ); @@ -1521,7 +1521,7 @@ function user_menu() { 'page arguments' => array('user_pass'), 'access callback' => TRUE, 'type' => MENU_LOCAL_TASK, - 'file' => 'user.pages.inc', + 'file' => 'user.pages.inc.php', ); $items['user/reset/%/%/%'] = array( 'title' => 'Reset password', @@ -1529,7 +1529,7 @@ function user_menu() { 'page arguments' => array('user_pass_reset', 2, 3, 4), 'access callback' => TRUE, 'type' => MENU_CALLBACK, - 'file' => 'user.pages.inc', + 'file' => 'user.pages.inc.php', ); $items['user/logout'] = array( @@ -1538,7 +1538,7 @@ function user_menu() { 'page callback' => 'user_logout', 'weight' => 10, 'menu_name' => 'user-menu', - 'file' => 'user.pages.inc', + 'file' => 'user.pages.inc.php', ); // User listing pages. @@ -1550,7 +1550,7 @@ function user_menu() { 'access arguments' => array('administer users'), 'position' => 'left', 'weight' => -4, - 'file' => 'user.admin.inc', + 'file' => 'user.admin.inc.php', ); $items['admin/people/people'] = array( 'title' => 'List', @@ -1558,7 +1558,7 @@ function user_menu() { 'access arguments' => array('administer users'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, - 'file' => 'user.admin.inc', + 'file' => 'user.admin.inc.php', ); // Permissions and role forms. @@ -1568,7 +1568,7 @@ function user_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('user_admin_permissions'), 'access arguments' => array('administer permissions'), - 'file' => 'user.admin.inc', + 'file' => 'user.admin.inc.php', 'type' => MENU_LOCAL_TASK, ); $items['admin/people/permissions/list'] = array( @@ -1583,7 +1583,7 @@ function user_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('user_admin_roles'), 'access arguments' => array('administer permissions'), - 'file' => 'user.admin.inc', + 'file' => 'user.admin.inc.php', 'type' => MENU_LOCAL_TASK, 'weight' => -5, ); @@ -1599,7 +1599,7 @@ function user_menu() { 'page arguments' => array('user_admin_role_delete_confirm', 5), 'access callback' => 'user_role_edit_access', 'access arguments' => array(5), - 'file' => 'user.admin.inc', + 'file' => 'user.admin.inc.php', ); $items['admin/people/create'] = array( @@ -1617,7 +1617,7 @@ function user_menu() { 'weight' => -20, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), - 'file' => 'system.admin.inc', + 'file' => 'system.admin.inc.php', 'file path' => drupal_get_path('module', 'system'), ); $items['admin/config/people/accounts'] = array( @@ -1626,7 +1626,7 @@ function user_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('user_admin_settings'), 'access arguments' => array('administer users'), - 'file' => 'user.admin.inc', + 'file' => 'user.admin.inc.php', 'weight' => -10, ); $items['admin/config/people/accounts/settings'] = array( @@ -1663,7 +1663,7 @@ function user_menu() { 'page arguments' => array('user_cancel_confirm_form', 1), 'access callback' => 'user_cancel_access', 'access arguments' => array(1), - 'file' => 'user.pages.inc', + 'file' => 'user.pages.inc.php', ); $items['user/%user/cancel/confirm/%/%'] = array( @@ -1672,7 +1672,7 @@ function user_menu() { 'page arguments' => array(1, 4, 5), 'access callback' => 'user_cancel_access', 'access arguments' => array(1), - 'file' => 'user.pages.inc', + 'file' => 'user.pages.inc.php', ); $items['user/%user/edit'] = array( @@ -1682,7 +1682,7 @@ function user_menu() { 'access callback' => 'user_edit_access', 'access arguments' => array(1), 'type' => MENU_LOCAL_TASK, - 'file' => 'user.pages.inc', + 'file' => 'user.pages.inc.php', ); return $items; } @@ -1694,7 +1694,7 @@ function user_menu_site_status_alter(&$menu_site_status, $path) { if ($menu_site_status == MENU_SITE_OFFLINE) { // If the site is offline, log out unprivileged users. if (user_is_logged_in() && !user_access('access site in maintenance mode')) { - module_load_include('pages.inc', 'user', 'user'); + module_load_include('php', 'user', 'user.pages.inc'); user_logout(); } @@ -2040,7 +2040,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', 'core/includes/password.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc.php'); if (user_check_password($password, $account)) { // Successful authentication. $uid = $account->uid; @@ -3092,7 +3092,7 @@ function user_multiple_cancel_confirm($form, &$form_state) { $form['operation'] = array('#type' => 'hidden', '#value' => 'cancel'); - module_load_include('inc', 'user', 'user.pages'); + module_load_include('php', 'user', 'user.pages.inc'); $form['user_cancel_method'] = array( '#type' => 'item', '#title' => t('When cancelling these accounts'), diff --git a/core/modules/user/user.test b/core/modules/user/user.test index 15c427b..04a8d72 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', 'core/includes/password.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc.php'); // 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', 'core/includes/password.inc'); + require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc.php'); $account = array( 'name' => 'user1', 'pass' => user_hash_password(trim($password)), diff --git a/core/scripts/generate-d6-content.sh b/core/scripts/generate-d6-content.sh index fc4c68f..7b2883b 100644 --- a/core/scripts/generate-d6-content.sh +++ b/core/scripts/generate-d6-content.sh @@ -96,7 +96,7 @@ for ($i = 0; $i < 24; $i++) { $node_id = 0; $revision_id = 0; -module_load_include('inc', 'node', 'node.pages'); +module_load_include('php', 'node', 'node.pages.inc'); for ($i = 0; $i < 24; $i++) { $uid = intval($i / 8) + 3; $user = user_load($uid); diff --git a/core/scripts/generate-d7-content.sh b/core/scripts/generate-d7-content.sh index e65c099..0dc740b 100644 --- a/core/scripts/generate-d7-content.sh +++ b/core/scripts/generate-d7-content.sh @@ -157,7 +157,7 @@ for ($i = 0; $i < 24; $i++) { } $node_id = 0; $revision_id = 0; -module_load_include('inc', 'node', 'node.pages'); +module_load_include('php', 'node', 'node.pages.inc'); for ($i = 0; $i < 24; $i++) { $uid = intval($i / 8) + 3; $user = user_load($uid); diff --git a/core/scripts/password-hash.sh b/core/scripts/password-hash.sh index 66fcb26..8411be2 100755 --- a/core/scripts/password-hash.sh +++ b/core/scripts/password-hash.sh @@ -81,8 +81,8 @@ while ($param = array_shift($_SERVER['argv'])) { chdir('../..'); define('DRUPAL_ROOT', getcwd()); -include_once DRUPAL_ROOT . '/core/includes/password.inc'; -include_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; +include_once DRUPAL_ROOT . '/core/includes/password.inc.php'; +include_once DRUPAL_ROOT . '/core/includes/bootstrap.inc.php'; 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 f747660..d342368 100755 --- a/core/scripts/run-tests.sh +++ b/core/scripts/run-tests.sh @@ -302,7 +302,7 @@ function simpletest_script_init($server_software) { chdir(realpath(__DIR__ . '/../..')); define('DRUPAL_ROOT', getcwd()); - require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; + require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc.php'; } /** diff --git a/core/update.php b/core/update.php index ac3b255..0db501e 100644 --- a/core/update.php +++ b/core/update.php @@ -351,11 +351,11 @@ 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 . '/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/unicode.inc'; +require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc.php'; +require_once DRUPAL_ROOT . '/core/includes/update.inc.php'; +require_once DRUPAL_ROOT . '/core/includes/common.inc.php'; +require_once DRUPAL_ROOT . '/core/includes/file.inc.php'; +require_once DRUPAL_ROOT . '/core/includes/unicode.inc.php'; update_prepare_d8_bootstrap(); // Determine if the current user has access to run update.php. @@ -366,12 +366,12 @@ drupal_bootstrap(DRUPAL_BOOTSTRAP_SESSION); // configuration). $op = isset($_REQUEST['op']) ? $_REQUEST['op'] : ''; if (empty($op) && update_access_allowed()) { - require_once DRUPAL_ROOT . '/core/includes/install.inc'; + require_once DRUPAL_ROOT . '/core/includes/install.inc.php'; require_once DRUPAL_ROOT . '/core/modules/system/system.install'; // Load module basics. - include_once DRUPAL_ROOT . '/core/includes/module.inc'; - $module_list['system']['filename'] = 'core/modules/system/system.module'; + include_once DRUPAL_ROOT . '/core/includes/module.inc.php'; + $module_list['system']['filename'] = 'core/modules/system/system.module.php'; module_list(TRUE, FALSE, FALSE, $module_list); drupal_load('module', 'system'); @@ -397,7 +397,7 @@ if (empty($op) && update_access_allowed()) { // So bootstrap to DRUPAL_BOOTSTRAP_LANGUAGE then include unicode.inc. drupal_bootstrap(DRUPAL_BOOTSTRAP_LANGUAGE); -include_once DRUPAL_ROOT . '/core/includes/unicode.inc'; +include_once DRUPAL_ROOT . '/core/includes/unicode.inc.php'; update_fix_d8_requirements(); @@ -413,8 +413,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 . '/core/includes/install.inc'; - include_once DRUPAL_ROOT . '/core/includes/batch.inc'; + include_once DRUPAL_ROOT . '/core/includes/install.inc.php'; + include_once DRUPAL_ROOT . '/core/includes/batch.inc.php'; drupal_load_updates(); update_fix_compatibility(); diff --git a/core/xmlrpc.php b/core/xmlrpc.php index 562aa81..934cd13 100644 --- a/core/xmlrpc.php +++ b/core/xmlrpc.php @@ -13,9 +13,9 @@ chdir('..'); */ define('DRUPAL_ROOT', getcwd()); -include_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; +include_once DRUPAL_ROOT . '/core/includes/bootstrap.inc.php'; drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); -include_once DRUPAL_ROOT . '/core/includes/xmlrpc.inc'; -include_once DRUPAL_ROOT . '/core/includes/xmlrpcs.inc'; +include_once DRUPAL_ROOT . '/core/includes/xmlrpc.inc.php'; +include_once DRUPAL_ROOT . '/core/includes/xmlrpcs.inc.php'; xmlrpc_server(module_invoke_all('xmlrpc')); diff --git a/index.php b/index.php index b91fb1e..4dea337 100644 --- a/index.php +++ b/index.php @@ -16,6 +16,6 @@ */ define('DRUPAL_ROOT', getcwd()); -require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc'; +require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc.php'; drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); menu_execute_active_handler(); -- 1.7.7