diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php index dfc5abc..b7b7b80 100644 --- a/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php +++ b/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php @@ -197,30 +197,30 @@ protected function buildRow(array $modules, $module, $distribution) { $help = $this->moduleHandler->moduleExists('help') ? drupal_help_arg() : FALSE; // Generate link for module's help page, if there is one. - $rowLinks['help'] = array(); + $row_links['help'] = array(); if ($help && $module->status && in_array($module->name, $this->moduleHandler->getImplementations('help'))) { if ($this->moduleHandler->invoke($module->name, 'help', array("admin/help#$module->name", $help))) { - $rowLinks['help'] = array( + $row_links['help'] = array( '#type' => 'link', '#title' => $this->t('Help'), '#href' => "admin/help/$module->name", '#options' => array( 'attributes' => array( - 'id' => 'edit-modules-core-'.$module->name.'-links-help', - 'class' => array( + 'id' => 'edit-modules-core-' . $module->name . '-links-help', + 'class' => array( 'module-link', 'module-link-help'), - 'title' => $this->t('Help') + 'title' => $this->t('Help'), ) ), - ); + ); } } // Generate link for module's permission, if the user has access to it. - $rowLinks['permissions'] = array(); + $row_links['permissions'] = array(); if ($module->status && user_access('administer permissions') && in_array($module->name, $this->moduleHandler->getImplementations('permission'))) { - $rowLinks['permissions'] = array( + $row_links['permissions'] = array( '#type' => 'link', '#title' => $this->t('Permissions'), '#href' => 'admin/people/permissions', @@ -229,7 +229,7 @@ protected function buildRow(array $modules, $module, $distribution) { } // Generate link for module's configuration page, if it has one. - $rowLinks['configure'] = array(); + $row_links['configure'] = array(); if ($module->status && isset($module->info['configure'])) { if ($this->accessManager->checkNamedRoute($module->info['configure'], array(), \Drupal::currentUser())) { $result = $this->queryFactory->get('menu_link') @@ -237,7 +237,7 @@ protected function buildRow(array $modules, $module, $distribution) { ->execute(); $menu_items = $this->entityManager->getStorageController('menu_link')->loadMultiple($result); $item = reset($menu_items); - $rowLinks['configure'] = array( + $row_links['configure'] = array( '#type' => 'link', '#title' => $this->t('Configure'), '#route_name' => $module->info['configure'], @@ -383,7 +383,7 @@ protected function buildRow(array $modules, $module, $distribution) { $links = ''; foreach (array('help', 'permissions', 'configure') as $key) { - $links .= (isset($rowLinks[$key]) ? drupal_render($rowLinks[$key]) : ''); + $links .= (isset($row_links[$key]) ? drupal_render($row_links[$key]) : ''); } if ($links) { diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php index 576f54d..3bf8e0c 100644 --- a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php +++ b/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php @@ -92,10 +92,8 @@ public function buildForm(array $form, array &$form_state) { '#header' => array( 'title' => array('data' => $this->t('Name')), 'description' => array('data' => $this->t('Description')), - ), - '#empty' => $this->t('There are no items yet. Disable a module', array( - '@add-url' => url('admin/modules'), - )), + ), + '#empty' => $this->t('There are no items yet. Disable a module', array('@add-url' => url('admin/modules'))), '#tableselect' => TRUE, '#js_select' => FALSE, );