Fix: remove deprecated method

Dolibarr · Mar 21, 2012 · aae57a9 · aae57a9
1 parent 52a8216
commit aae57a9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
@@ -44,7 +44,7 @@
 // Database
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Database").'</td></tr>'."\n";
-print '<tr '.$bc[0].'><td width="300">'.$langs->trans("Version").'</td><td>'.$db->getLabel().' '.$db->getVersion().'</td></tr>'."\n";
+print '<tr '.$bc[0].'><td width="300">'.$langs->trans("Version").'</td><td>'.getStaticMember(get_class($db),'label').' '.$db->getVersion().'</td></tr>'."\n";
 print '<tr '.$bc[1].'><td width="300">'.$langs->trans("DatabaseServer").'</td><td>'.$conf->db->host.'</td></tr>'."\n";
 print '<tr '.$bc[0].'><td width="300">'.$langs->trans("DatabasePort").'</td><td>'.(empty($conf->db->port)?$langs->trans("Default"):$conf->db->port).'</td></tr>'."\n";
 print '<tr '.$bc[1].'><td width="300">'.$langs->trans("DatabaseName").'</td><td>'.$conf->db->name.'</td></tr>'."\n";

diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php
@@ -86,7 +86,7 @@
 // Database
 print '<table class="noborder" width="100%">';
 print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("Database")."</td></tr>\n";
-$dblabel=$db->getLabel();
+$dblabel=getStaticMember(get_class($db),'label');
 $dbversion=$db->getVersion();
 print "<tr $bc[0]><td width=\"280\">".$langs->trans("Version")."</td><td>" .$dblabel." ".$dbversion."</td></tr>\n";
 print '</table>';

diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
@@ -233,16 +233,6 @@ function connect($host, $login, $passwd, $name, $port=0)
         return $this->db;
     }
 
-    /**
-	 * Return label of manager
-	 *
-	 * @return			string      Label
-     */
-    function getLabel()
-    {
-        return $this->label;
-    }
-
     /**
 	 *	Return version of database server
 	 *