From 286b9a79e0cc802efc363d23c4285320e7225b59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 26 Feb 2014 08:53:22 +0100
Subject: [PATCH] Remove control link from PMA_List_Database class
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This code is there from time when we used SHOW DATABASE, which could
fail with --skip-show-database. As we now use information schema which
is not limited by this, there is no need for this workaround.

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/List_Database.class.php | 37 +++++++------------------------
 libraries/PMA.php                 |  3 +--
 2 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php
index fcb5481783..4253f39ce5 100644
--- a/libraries/List_Database.class.php
+++ b/libraries/List_Database.class.php
@@ -19,12 +19,10 @@ require_once './libraries/List.class.php';
  * handles database lists
  *
  * <code>
- * $PMA_List_Database = new PMA_List_Database($userlink, $controllink);
+ * $PMA_List_Database = new PMA_List_Database($userlink);
  * </code>
  *
  * @todo this object should be attached to the PMA_Server object
- * @todo ? make use of INFORMATION_SCHEMA
- * @todo ? support --skip-showdatabases and user has only global rights
  *
  * @package PhpMyAdmin
  * @since   phpMyAdmin 2.9.10
@@ -43,12 +41,6 @@ class PMA_List_Database extends PMA_List
      */
     protected $db_link_user = null;
 
-    /**
-     * @var mixed   controluser database link resource|object
-     * @access protected
-     */
-    protected $db_link_control = null;
-
     /**
      * @var boolean whether we can retrieve the list of databases
      * @access protected
@@ -58,14 +50,12 @@ class PMA_List_Database extends PMA_List
     /**
      * Constructor
      *
-     * @param mixed $db_link_user    user database link resource|object
-     * @param mixed $db_link_control control database link resource|object
+     * @param mixed $db_link_user user database link resource|object
      */
-    public function __construct($db_link_user = null, $db_link_control = null)
+    public function __construct($db_link_user = null)
     {
         $this->db_link = $db_link_user;
         $this->db_link_user = $db_link_user;
-        $this->db_link_control = $db_link_control;
 
         parent::__construct();
         $this->build();
@@ -115,22 +105,11 @@ class PMA_List_Database extends PMA_List
         $GLOBALS['dbi']->getError();
 
         if ($GLOBALS['errno'] !== 0) {
-            // failed to get database list, try the control user
-            // (hopefully there is one and he has the necessary rights)
-            $this->db_link = $this->db_link_control;
-            $database_list = $GLOBALS['dbi']->fetchResult(
-                $command, null, null, $this->db_link
-            );
-
-            $GLOBALS['dbi']->getError();
-
-            if ($GLOBALS['errno'] !== 0) {
-                // failed! we will display a warning that phpMyAdmin could not
-                // safely retrieve database list, the admin has to setup a
-                // control user
-                $GLOBALS['error_showdatabases'] = true;
-                $this->can_retrieve_databases = false;
-            }
+            // failed! we will display a warning that phpMyAdmin could not
+            // safely retrieve database list, the admin has to setup a
+            // control user
+            $GLOBALS['error_showdatabases'] = true;
+            $this->can_retrieve_databases = false;
         }
 
         if ($GLOBALS['cfg']['NaturalOrder']) {
diff --git a/libraries/PMA.php b/libraries/PMA.php
index 021917d374..c7e8326030 100644
--- a/libraries/PMA.php
+++ b/libraries/PMA.php
@@ -99,8 +99,7 @@ class PMA
     {
         if (null === $this->databases) {
             $this->databases = new PMA_List_Database(
-                $this->userlink,
-                $this->controllink
+                $this->userlink
             );
         }