From ea28079e110dbade35e3f70037296f0b6b5efddf Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Tue, 18 Mar 2008 12:31:45 +0000 Subject: [PATCH] Move extension name to extension git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@375 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- abstraction.inc.php | 6 ++++-- connect.inc.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/abstraction.inc.php b/abstraction.inc.php index 36ac7385..8eeca206 100644 --- a/abstraction.inc.php +++ b/abstraction.inc.php @@ -1,6 +1,8 @@ init(); } @@ -26,7 +28,7 @@ if (extension_loaded("mysqli")) { } elseif (extension_loaded("mysql")) { class Min_MySQL { - var $_link, $_result, $server_info, $affected_rows, $error; + var $extension = "MySQL", $_link, $_result, $server_info, $affected_rows, $error; function connect($server, $username, $password) { $this->_link = @mysql_connect( @@ -111,7 +113,7 @@ if (extension_loaded("mysqli")) { } elseif (extension_loaded("pdo_mysql")) { class Min_PDO_MySQL extends PDO { - var $_result, $server_info, $affected_rows, $error; + var $extension = "PDO_MySQL", $_result, $server_info, $affected_rows, $error; function __construct() { } diff --git a/connect.inc.php b/connect.inc.php index f430b7b4..40149fe7 100644 --- a/connect.inc.php +++ b/connect.inc.php @@ -11,7 +11,7 @@ if (!(strlen($_GET["db"]) ? $mysql->select_db($_GET["db"]) : isset($_GET["sql"]) echo '

' . lang('Create new database') . "

\n"; echo '

' . lang('Privileges') . "

\n"; echo '

' . lang('Process list') . "

\n"; - echo "

" . lang('MySQL version: %s through PHP extension %s', "$mysql->server_info", "" . (extension_loaded("mysqli") ? "MySQLi" : (extension_loaded("mysql") ? "MySQL" : "PDO")) . "") . "

\n"; + echo "

" . lang('MySQL version: %s through PHP extension %s', "$mysql->server_info", "$mysql->extension") . "

\n"; } page_footer("db"); exit;