From 09b54ed19be4868ac3a36fe0a19fb27514f629b3 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 8 Apr 2014 10:03:58 -0400 Subject: Put back code lost since 2a8962aa95ba5f8b11439bfe3e9ecc88decb2c88 Signed-off-by: Marc Delisle --- index.php | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'index.php') diff --git a/index.php b/index.php index 78cffd27e0..f0d4f054dd 100644 --- a/index.php +++ b/index.php @@ -304,12 +304,7 @@ if ($GLOBALS['cfg']['ShowServerInfo'] || $GLOBALS['cfg']['ShowPhpInfo']) { if ($server > 0) { $client_version_str = $GLOBALS['dbi']->getClientInfo(); - if (preg_match('#\d+\.\d+\.\d+#', $client_version_str) - && in_array( - $GLOBALS['cfg']['Server']['extension'], - array('mysql', 'mysqli') - ) - ) { + if (preg_match('#\d+\.\d+\.\d+#', $client_version_str)) { $client_version_str = 'libmysql - ' . $client_version_str; } PMA_printListItem( @@ -317,15 +312,14 @@ if ($GLOBALS['cfg']['ShowServerInfo'] || $GLOBALS['cfg']['ShowPhpInfo']) { 'li_mysql_client_version' ); - $php_ext_string = __('PHP extension:') . ' ' - . $GLOBALS['cfg']['Server']['extension'] . ' '; - if (!empty($GLOBALS['cfg']['Server']['extension'])) { - $php_ext_string .= PMA_Util::showPHPDocu( - 'book.' . $GLOBALS['cfg']['Server']['extension'] . '.php' - ); + $php_ext_string = __('PHP extension:') . ' '; + if (PMA_DatabaseInterface::checkDbExtension('mysqli')) { + $extension = 'mysqli'; } else { - $php_ext_string .= __('None'); + $extension = 'mysql'; } + $php_ext_string .= $extension . ' ' + . PMA_Util::showPHPDocu( 'book.' . $extension . '.php'); PMA_printListItem( $php_ext_string, -- cgit v1.2.3