Move extension name to extension

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@375 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/abstraction.inc.php b/abstraction.inc.php
index 36ac73856759f35bcf380ad0e3f134b37422d25c..8eeca20665f055cb6383329f794c917f7b455b70 100644 (file)
--- a/abstraction.inc.php
+++ b/abstraction.inc.php
@@ -1,6 +1,8 @@
 <?php
 if (extension_loaded("mysqli")) {
        class Min_MySQLi extends MySQLi {
+               var $extension = "MySQLi";
+               
                function Min_MySQLi() {
                        $this->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 f430b7b45eb87795a832854943b5b15d9ddf653a..40149fe7ced7976fdd588e15eac5a8b04bcd1383 100644 (file)
--- 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 '<p><a href="' . htmlspecialchars($SELF) . 'database=">' . lang('Create new database') . "</a></p>\n";
                echo '<p><a href="' . htmlspecialchars($SELF) . 'privileges=">' . lang('Privileges') . "</a></p>\n";
                echo '<p><a href="' . htmlspecialchars($SELF) . 'processlist=">' . lang('Process list') . "</a></p>\n";
-               echo "<p>" . lang('MySQL version: %s through PHP extension %s', "<b>$mysql->server_info</b>", "<b>" . (extension_loaded("mysqli") ? "MySQLi" : (extension_loaded("mysql") ? "MySQL" : "PDO")) . "</b>") . "</p>\n";
+               echo "<p>" . lang('MySQL version: %s through PHP extension %s', "<b>$mysql->server_info</b>", "<b>$mysql->extension</b>") . "</p>\n";
        }
        page_footer("db");
        exit;