diff --git a/core/modules/system/system.install b/core/modules/system/system.install index f38af8a..71ff30f 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -134,21 +134,20 @@ function system_requirements($phase) { } // Test PHP version and show link to phpinfo() if it's available - $phpversion = $phpversion_label = phpversion(); + $phpversion = phpversion(); if (function_exists('phpinfo')) { - // $phpversion is safe and output of l() is safe, so this value is safe. - if ($phase === 'runtime') { - $phpversion_label = SafeMarkup::set($phpversion . ' (' . \Drupal::l(t('more information'), new Url('system.php')) . ')'); - } $requirements['php'] = array( 'title' => t('PHP'), - 'value' => $phpversion_label, + 'value' => $phpversion, ); + if ($phase === 'runtime') { + $requirements['php']['description'] = t('For more information view the PHP configuration.', ['@url' => (new Url('system.php'))->toString()]); + } } else { $requirements['php'] = array( 'title' => t('PHP'), - 'value' => $phpversion_label, + 'value' => $phpversion, 'description' => t('The phpinfo() function has been disabled for security reasons. To see your server\'s phpinfo() information, change your PHP settings or contact your server administrator. For more information, Enabling and disabling phpinfo() handbook page.', array('@phpinfo' => 'https://www.drupal.org/node/243993')), 'severity' => REQUIREMENT_INFO, ); @@ -166,7 +165,7 @@ function system_requirements($phase) { if (($phase === 'install' || \Drupal::database()->driver() === 'mysql') && !SystemRequirements::phpVersionWithPdoDisallowMultipleStatements($phpversion)) { $requirements['php'] = array( 'title' => t('PHP (multiple statement disabling)'), - 'value' => $phpversion_label, + 'value' => $phpversion, 'description' => t('PHP versions higher than 5.6.5 or 5.5.21 provide built-in SQL injection protection for mysql databases. It is recommended to update.'), 'severity' => REQUIREMENT_INFO, );