The PMA_Menu class no longer need to be a singleton

1 files changed, 2 insertions, 27 deletions

diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php
index 5b234346d2..61c188c096 100644
--- a/libraries/Menu.class.php
+++ b/libraries/Menu.class.php
@@ -37,17 +37,9 @@ class PMA_Menu
      * @var string
      */
     private $_table;
-    /**
-     * PMA_Menu instance
-     *
-     * @access private
-     * @static
-     * @var object
-     */
-    private static $_instance;
 
     /**
-     * Private constructor disables direct object creation
+     * Creates a new instance of PMA_Menu
      *
      * @param int    $server Server id
      * @param string $db     Database name
@@ -55,7 +47,7 @@ class PMA_Menu
      *
      * @return New PMA_Table
      */
-    private function __construct($server, $db, $table)
+    public function __construct($server, $db, $table)
     {
         $this->_server = $server;
         $this->_db = $db;
@@ -67,23 +59,6 @@ class PMA_Menu
      *
      * @return void
      */
-    public static function getInstance()
-    {
-        if (empty(self::$_instance)) {
-            self::$_instance = new PMA_Menu(
-                $GLOBALS['server'],
-                $GLOBALS['db'],
-                $GLOBALS['table']
-            );
-        }
-        return self::$_instance;
-    }
-
-    /**
-     * Prints the menu and the breadcrumbs
-     *
-     * @return void
-     */
     public function display()
     {
         echo $this->getDisplay();