Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove structure.lib.php and display_structure.inc.php
Signed-off-by: Jason <jason.daurus@gmail.com>
  • Loading branch information
gzzhanghao committed Jul 31, 2015
1 parent 1c28e6a commit 3fe4f63
Show file tree
Hide file tree
Showing 11 changed files with 776 additions and 790 deletions.
10 changes: 8 additions & 2 deletions db_structure.php
Expand Up @@ -20,7 +20,8 @@
'StructureController', 'PMA\Controllers\StructureController'
);

global $db, $table, $pos, $db_is_system_schema, $total_num_tables, $tables, $num_tables;
global $db, $table, $pos, $db_is_system_schema, $total_num_tables, $tables,
$num_tables, $tbl_is_view, $tbl_storage_engine, $table_info_num_rows, $tbl_collation, $showtable;
/* Define dependencies for the concerned controller */
$dependency_definitions = array(
'db' => $db,
Expand All @@ -31,7 +32,12 @@
'db_is_system_schema' => $db_is_system_schema,
'num_tables' => $num_tables,
'total_num_tables' => $total_num_tables,
'tables' => $tables
'tables' => $tables,
'tbl_is_view' => $tbl_is_view,
'tbl_storage_engine' => $tbl_storage_engine,
'table_info_num_rows' => $table_info_num_rows,
'tbl_collation' => $tbl_collation,
'showtable' => $showtable
);

/** @var Controllers\StructureController $controller */
Expand Down
473 changes: 452 additions & 21 deletions libraries/controllers/StructureController.class.php

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion libraries/controllers/TableRelationController.class.php
Expand Up @@ -14,7 +14,6 @@
require_once 'libraries/index.lib.php';
require_once 'libraries/Template.class.php';
require_once 'libraries/Table.class.php';
require_once 'libraries/structure.lib.php';
require_once 'libraries/Index.class.php';
require_once 'libraries/Util.class.php';

Expand Down

0 comments on commit 3fe4f63

Please sign in to comment.