Resolved conflicts

1 files changed, 1 insertions, 6 deletions

diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php
index ba7dc7047d..5b854d6c08 100644
--- a/libraries/Menu.class.php
+++ b/libraries/Menu.class.php
@@ -267,12 +267,7 @@ class PMA_Menu
     {
         $db_is_information_schema = PMA_is_system_schema($this->_db);
         $tbl_is_view = PMA_Table::isView($this->_db, $this->_table);
-
-        $table_status = PMA_Table::sGetStatusInfo($this->_db, $this->_table);
-        $table_info_num_rows = 0;
-        if (isset($table_status['Rows'])) {
-            $table_info_num_rows = $table_status['Rows'];
-        }
+        $table_info_num_rows = PMA_Table::countRecords($this->_db, $this->_table);
 
         $tabs = array();