From e64d7e2661c0cfd1d99daededd51f4fef4ff4b2b Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Fri, 28 Oct 2022 09:49:38 +0200 Subject: [PATCH 1/3] Fix SCHEMA_NAME links Signed-off-by: Liviu-Mihail Concioiu --- libraries/classes/Config/SpecialSchemaLinks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/classes/Config/SpecialSchemaLinks.php b/libraries/classes/Config/SpecialSchemaLinks.php index 1a3c93ba15..8da44947a8 100644 --- a/libraries/classes/Config/SpecialSchemaLinks.php +++ b/libraries/classes/Config/SpecialSchemaLinks.php @@ -66,7 +66,7 @@ class SpecialSchemaLinks { global $cfg; - $defaultPage = './' . Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table'); + $defaultPage = './' . Util::getScriptNameForOption($cfg['DefaultTabTable'], 'database'); return [ 'mysql' => [ From 73f6017f2fdbc4925ab48f244506441fb9a66e75 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 29 Oct 2022 15:33:19 +0200 Subject: [PATCH 2/3] Fix Signed-off-by: Liviu-Mihail Concioiu --- libraries/classes/Config/SpecialSchemaLinks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/classes/Config/SpecialSchemaLinks.php b/libraries/classes/Config/SpecialSchemaLinks.php index 8da44947a8..640ad4a6ec 100644 --- a/libraries/classes/Config/SpecialSchemaLinks.php +++ b/libraries/classes/Config/SpecialSchemaLinks.php @@ -66,7 +66,7 @@ class SpecialSchemaLinks { global $cfg; - $defaultPage = './' . Util::getScriptNameForOption($cfg['DefaultTabTable'], 'database'); + $defaultPage = './' . Util::getScriptNameForOption($cfg['DefaultTabDatabase'], 'database'); return [ 'mysql' => [ From a366032ab96f076c56384d82fcedf1e42ca345fe Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 29 Oct 2022 16:09:09 +0200 Subject: [PATCH 3/3] Fix Signed-off-by: Liviu-Mihail Concioiu --- .../classes/Config/SpecialSchemaLinks.php | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/libraries/classes/Config/SpecialSchemaLinks.php b/libraries/classes/Config/SpecialSchemaLinks.php index 640ad4a6ec..b4393a7bcb 100644 --- a/libraries/classes/Config/SpecialSchemaLinks.php +++ b/libraries/classes/Config/SpecialSchemaLinks.php @@ -66,7 +66,8 @@ class SpecialSchemaLinks { global $cfg; - $defaultPage = './' . Util::getScriptNameForOption($cfg['DefaultTabDatabase'], 'database'); + $defaultPageDatabase = './' . Util::getScriptNameForOption($cfg['DefaultTabDatabase'], 'database'); + $defaultPageTable = './' . Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table'); return [ 'mysql' => [ @@ -89,7 +90,7 @@ class SpecialSchemaLinks 'column_name' => 'Db', ], ], - 'default_page' => $defaultPage, + 'default_page' => $defaultPageTable, ], 'column_name' => [ 'link_param' => 'field', @@ -140,7 +141,7 @@ class SpecialSchemaLinks 'column_name' => 'database_name', ], ], - 'default_page' => $defaultPage, + 'default_page' => $defaultPageTable, ], 'index_name' => [ 'link_param' => 'index', @@ -166,7 +167,7 @@ class SpecialSchemaLinks 'column_name' => 'database_name', ], ], - 'default_page' => $defaultPage, + 'default_page' => $defaultPageTable, ], ], 'proc' => [ @@ -256,7 +257,7 @@ class SpecialSchemaLinks 'column_name' => 'Db', ], ], - 'default_page' => $defaultPage, + 'default_page' => $defaultPageTable, ], ], 'user' => [ @@ -282,7 +283,7 @@ class SpecialSchemaLinks 'column_name' => 'table_schema', ], ], - 'default_page' => $defaultPage, + 'default_page' => $defaultPageTable, ], 'column_name' => [ 'link_param' => 'field', @@ -308,7 +309,7 @@ class SpecialSchemaLinks 'column_name' => 'constraint_schema', ], ], - 'default_page' => $defaultPage, + 'default_page' => $defaultPageTable, ], 'column_name' => [ 'link_param' => 'field', @@ -332,7 +333,7 @@ class SpecialSchemaLinks 'column_name' => 'referenced_table_schema', ], ], - 'default_page' => $defaultPage, + 'default_page' => $defaultPageTable, ], 'referenced_column_name' => [ 'link_param' => 'field', @@ -358,7 +359,7 @@ class SpecialSchemaLinks 'column_name' => 'table_schema', ], ], - 'default_page' => $defaultPage, + 'default_page' => $defaultPageTable, ], ], 'processlist' => [ @@ -382,7 +383,7 @@ class SpecialSchemaLinks 'column_name' => 'constraint_schema', ], ], - 'default_page' => $defaultPage, + 'default_page' => $defaultPageTable, ], 'referenced_table_name' => [ 'link_param' => 'table', @@ -392,7 +393,7 @@ class SpecialSchemaLinks 'column_name' => 'constraint_schema', ], ], - 'default_page' => $defaultPage, + 'default_page' => $defaultPageTable, ], ], 'routines' => [ @@ -414,7 +415,7 @@ class SpecialSchemaLinks 'schemata' => [ 'schema_name' => [ 'link_param' => 'db', - 'default_page' => $defaultPage, + 'default_page' => $defaultPageDatabase, ], ], 'statistics' => [ @@ -426,7 +427,7 @@ class SpecialSchemaLinks 'column_name' => 'table_schema', ], ], - 'default_page' => $defaultPage, + 'default_page' => $defaultPageTable, ], 'column_name' => [ 'link_param' => 'field', @@ -452,7 +453,7 @@ class SpecialSchemaLinks 'column_name' => 'table_schema', ], ], - 'default_page' => $defaultPage, + 'default_page' => $defaultPageTable, ], ], 'table_constraints' => [ @@ -464,7 +465,7 @@ class SpecialSchemaLinks 'column_name' => 'table_schema', ], ], - 'default_page' => $defaultPage, + 'default_page' => $defaultPageTable, ], ], 'views' => [ @@ -476,7 +477,7 @@ class SpecialSchemaLinks 'column_name' => 'table_schema', ], ], - 'default_page' => $defaultPage, + 'default_page' => $defaultPageTable, ], ], ],