' . t('You can enable the newly-created block for this menu on the Blocks administration page.', array('@blocks' => url('admin/structure/block'))) . '
'; } - if ($path == 'admin/structure/menu' && module_exists('block')) { + if ($path == 'admin/structure/menu' && \Drupal::moduleHandler()->moduleExists('block')) { return '' . t('Each menu has a corresponding block that is managed on the Blocks administration page.', array('@blocks' => url('admin/structure/block'))) . '
'; } } diff --git a/core/modules/node/node.module b/core/modules/node/node.module index f163b51e71e72a254f8cc6b7dd7efdfa7b02a982..c1ccf4e96fd5695a0e341db2a6856a660ce965de 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -279,7 +279,7 @@ function node_mark($nid, $timestamp) { global $user; $cache = &drupal_static(__FUNCTION__, array()); - if ($user->isAnonymous() || !module_exists('history')) { + if ($user->isAnonymous() || !\Drupal::moduleHandler()->moduleExists('history')) { return MARK_READ; } if (!isset($cache[$nid])) { @@ -443,7 +443,7 @@ function node_add_body_field(NodeTypeInterface $type, $label = 'Body') { */ function node_field_extra_fields() { $extra = array(); - $module_language_enabled = module_exists('language'); + $module_language_enabled = \Drupal::moduleHandler()->moduleExists('language'); $description = t('Node module element'); foreach (node_type_get_types() as $bundle) { diff --git a/core/modules/node/node.views.inc b/core/modules/node/node.views.inc index 0f2fb92b39373be596ddce18ce41315e5dd3f8aa..6c826043945eb53a458c0f54ed9029bb0cc295ae 100644 --- a/core/modules/node/node.views.inc +++ b/core/modules/node/node.views.inc @@ -648,7 +648,7 @@ function node_row_node_view_preprocess_node(&$variables) { */ function node_views_wizard() { // @todo: figure this piece out. - if (module_exists('statistics')) { + if (\Drupal::moduleHandler()->moduleExists('statistics')) { $plugins['node']['available_sorts']['node_counter-totalcount:DESC'] = t('Number of hits'); } diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module index 912e29dc8a530cd44580d09b3109463a262f3447..284442bdd8f445dfee2e0e0f6e5022d03c5adc09 100644 --- a/core/modules/overlay/overlay.module +++ b/core/modules/overlay/overlay.module @@ -501,7 +501,7 @@ function overlay_overlay_parent_initialize() { } drupal_add_js(array('overlay' => array('paths' => $paths)), 'setting'); $path_prefixes = array(); - if (module_exists('language')) { + if (\Drupal::moduleHandler()->moduleExists('language')) { language_negotiation_include(); if (\Drupal::config('language.negotiation')->get('url.source') == LANGUAGE_NEGOTIATION_URL_PREFIX) { // Skip the empty string indicating the default language. We always accept diff --git a/core/modules/path/path.admin.inc b/core/modules/path/path.admin.inc index 4c5b3f4a0fd90a216374a8aed702077498487b95..d387bff825fa46ef51098e223918886efad0fd8a 100644 --- a/core/modules/path/path.admin.inc +++ b/core/modules/path/path.admin.inc @@ -21,7 +21,7 @@ function path_admin_overview($keys = NULL) { // Enable language column if language.module is enabled or if we have any // alias with a language. $alias_exists = (bool) db_query_range('SELECT 1 FROM {url_alias} WHERE langcode <> :langcode', 0, 1, array(':langcode' => Language::LANGCODE_NOT_SPECIFIED))->fetchField(); - $multilanguage = (module_exists('language') || $alias_exists); + $multilanguage = (\Drupal::moduleHandler()->moduleExists('language') || $alias_exists); $header = array(); $header[] = array('data' => t('Alias'), 'field' => 'alias', 'sort' => 'asc'); @@ -157,7 +157,7 @@ function path_admin_form($form, &$form_state, $path = array('source' => '', 'ali ); // A hidden value unless language.module is enabled. - if (module_exists('language')) { + if (\Drupal::moduleHandler()->moduleExists('language')) { $languages = language_list(); foreach ($languages as $langcode => $language) { $language_options[$langcode] = $language->name; diff --git a/core/modules/system/system.install b/core/modules/system/system.install index f220198c6c1eb3e2e16f70b7681b920cc3ce5645..0d2dbebb5f01cdf9e847a61aaab3660fe2436d40 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -505,7 +505,7 @@ function system_requirements($phase) { if ($phase == 'runtime') { // Check for update status module. - if (!module_exists('update')) { + if (!\Drupal::moduleHandler()->moduleExists('update')) { $requirements['update status'] = array( 'value' => t('Not enabled'), 'severity' => REQUIREMENT_WARNING, diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 9309d7502a244329a2ea40cb2c689daacb0275d0..acdf63953f269dc5b302f980f4ca25ed9a40d8a2 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -103,7 +103,7 @@ function system_help($path, $arg) { return '' . t('These options control the default display settings for your entire site, across all themes. Unless they have been overridden by a specific theme, these settings will be used.') . '
'; case 'admin/modules': $output = '' . t('Download additional contributed modules to extend Drupal\'s functionality.', array('@modules' => 'http://drupal.org/project/modules')) . '
'; - if (module_exists('update')) { + if (\Drupal::moduleHandler()->moduleExists('update')) { if (update_manager_access()) { $output .= '' . t('Regularly review and install available updates to maintain a secure and current site. Always run the update script each time a module is updated.', array('@update-php' => $base_url . '/core/update.php', '@updates' => url('admin/reports/updates'))) . '
'; } @@ -886,7 +886,7 @@ function system_menu() { ); // Localize date formats. - if (module_exists('language')) { + if (\Drupal::moduleHandler()->moduleExists('language')) { $items['admin/config/regional/date-time/locale'] = array( 'title' => 'Localize', 'description' => 'Configure date formats for each locale', diff --git a/core/modules/system/tests/modules/entity_test/entity_test.views.inc b/core/modules/system/tests/modules/entity_test/entity_test.views.inc index 5e3975b28f457935967fa22c820802cb92c35b98..32da74d1cd15caada9cc190b500a6b3a2f9fcbb0 100644 --- a/core/modules/system/tests/modules/entity_test/entity_test.views.inc +++ b/core/modules/system/tests/modules/entity_test/entity_test.views.inc @@ -55,7 +55,7 @@ function entity_test_views_data() { ), ); - if (module_exists('langcode')) { + if (\Drupal::moduleHandler()->moduleExists('langcode')) { $data['entity_test']['langcode'] = array( 'title' => t('Language'), 'help' => t('The {language}.langcode of the original variant of this test entity.'), diff --git a/core/modules/tracker/tracker.pages.inc b/core/modules/tracker/tracker.pages.inc index 16b391e5cab7c917db7e96693a2b889e410c504c..eeef432cc4170e6890004596b8d3dbcb207e024d 100644 --- a/core/modules/tracker/tracker.pages.inc +++ b/core/modules/tracker/tracker.pages.inc @@ -101,7 +101,7 @@ function tracker_page($account = NULL, $set_title = FALSE) { ); // Adds extra RDFa markup to the $row array if the RDF module is enabled. - if (module_exists('rdf')) { + if (\Drupal::moduleHandler()->moduleExists('rdf')) { $mapping = rdf_get_mapping('node', $node->getType()); // Adds RDFa markup to the title of the node. Because the RDFa markup is // added to the td tag which might contain HTML code, we specify an diff --git a/core/modules/user/user.install b/core/modules/user/user.install index 7620ee51cc817d61c9c2c5eaf83ed59795682fbb..0aa4d17bac4c5a3988e9eb0d94b1c29a632e4c6d 100644 --- a/core/modules/user/user.install +++ b/core/modules/user/user.install @@ -608,7 +608,7 @@ function user_update_8011() { // User pictures can only be migrated to the new user picture image field // if Image module is installed. - if (!module_exists('image')) { + if (!\Drupal::moduleHandler()->moduleExists('image')) { $old_schema = \Drupal::moduleHandler()->install(array('image')); if ($old_schema['image'] == SCHEMA_UNINSTALLED) { // Install image.module with schema version 8002 as a previous version diff --git a/core/scripts/generate-d7-content.sh b/core/scripts/generate-d7-content.sh index 87ec22ac6c39dc91d0c67e347b9e0a08471e1244..bd24300f3b8d50b19b9b6b1f2aabfeb56e82e285 100644 --- a/core/scripts/generate-d7-content.sh +++ b/core/scripts/generate-d7-content.sh @@ -171,7 +171,7 @@ else if ($i < 24) { $node->type = 'story'; } - else if (module_exists('blog')) { + else if (\Drupal::moduleHandler()->moduleExists('blog')) { $node->type = 'blog'; } $node->sticky = 0; diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh index 31ea371cac65d454dae6fac9da141b7c30d15d53..3754ebdf393cab9eba3ad3f8e532d45ba09ed57d 100755 --- a/core/scripts/run-tests.sh +++ b/core/scripts/run-tests.sh @@ -35,7 +35,7 @@ drupal_bootstrap(DRUPAL_BOOTSTRAP_CODE); simpletest_classloader_register(); -if (!module_exists('simpletest')) { +if (!\Drupal::moduleHandler()->moduleExists('simpletest')) { simpletest_script_print_error("The simpletest module must be enabled before this script can run."); exit; } diff --git a/core/update.php b/core/update.php index db92c1aa680a14ea0b227c1692b38e47ee2aa5b2..ae74e2914e53b9a07586742db8792d0d8ded129c 100644 --- a/core/update.php +++ b/core/update.php @@ -203,7 +203,7 @@ function update_results_page() { update_task_list(); // Report end result. - if (module_exists('dblog') && user_access('access site reports')) { + if (\Drupal::moduleHandler()->moduleExists('dblog') && user_access('access site reports')) { $log_message = ' All errors have been logged.'; } else { @@ -217,7 +217,7 @@ function update_results_page() { $last = reset($_SESSION['updates_remaining']); list($module, $version) = array_pop($last); $output = 'The update process was aborted prematurely while running update #' . $version . ' in ' . $module . '.module.' . $log_message;
- if (module_exists('dblog')) {
+ if (\Drupal::moduleHandler()->moduleExists('dblog')) {
$output .= ' You may need to check the watchdog database table manually.';
}
$output .= '