Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <michal@cihar.com>2016-04-06 11:19:37 +0300
committerMichal Čihař <michal@cihar.com>2016-04-06 11:19:37 +0300
commit298efcf13964e2f7bfcb2a714bcf33a3604cc526 (patch)
tree46149f68dde9d9a7cda2e59c9718e009f930f7bd /db_structure.php
parentd8d9ab421e6bbcc4ca62f9ceb8a6f442e4efc0e3 (diff)
parentec984877d827c72c614100c5fc4574c61fbd0b28 (diff)
Merge branch 'QA_4_6'
Diffstat (limited to 'db_structure.php')
-rw-r--r--db_structure.php18
1 files changed, 0 insertions, 18 deletions
diff --git a/db_structure.php b/db_structure.php
index e557340228..2bb9ec146a 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -15,18 +15,6 @@ use PMA\libraries\Util;
require_once 'libraries/common.inc.php';
require_once 'libraries/db_common.inc.php';
-list(
- $tables,
- $num_tables,
- $total_num_tables,
- $sub_part,
- $is_show_stats,
- $db_is_system_schema,
- $tooltip_truename,
- $tooltip_aliasname,
- $pos
-) = Util::getDbInfo($GLOBALS['db'], '_structure');
-
$container = libraries\di\Container::getDefaultContainer();
$container->factory(
'PMA\libraries\controllers\database\DatabaseStructureController'
@@ -38,16 +26,10 @@ $container->alias(
$container->set('PMA\libraries\Response', Response::getInstance());
$container->alias('response', 'PMA\libraries\Response');
-global $db, $pos, $db_is_system_schema, $total_num_tables, $tables, $num_tables;
/* Define dependencies for the concerned controller */
$dependency_definitions = array(
'db' => $db,
'url_query' => &$GLOBALS['url_query'],
- 'pos' => $pos,
- 'db_is_system_schema' => $db_is_system_schema,
- 'num_tables' => $num_tables,
- 'total_num_tables' => $total_num_tables,
- 'tables' => $tables,
);
/** @var DatabaseStructureController $controller */