diff --git a/ChangeLog b/ChangeLog index 9e6046e1a5..4745e9aca5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ phpMyAdmin - ChangeLog - bug #4089 Moving Columns will alter column definition - bug #4091 Insert ignore option does not work - bug #4090 Downloading BLOB downloads page template +- bug #4092 Clicking on table name in view of information_schema redirects to wrong page 4.0.6.0 (2013-09-05) - bug #4036 Call to undefined function mb_detect_encoding (clarify the doc) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 7825f6a3e5..ae111c8027 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -3144,10 +3144,10 @@ class PMA_DisplayResults // Special case 1 - when executing routines, according // to the type of the routine, url param changes if (!empty($row_info['routine_type'])) { - if (strtolower($row_info['routine_type']) == self::ROUTINE_PROCEDURE) { - $linking_url_params['execute_routine'] = 1; - } else if (strtolower($row_info['routine_type']) == self::ROUTINE_FUNCTION) { - $linking_url_params['execute_dialog'] = 1; + if (strtolower($row_info['routine_type']) == self::ROUTINE_PROCEDURE + || strtolower($row_info['routine_type']) == self::ROUTINE_FUNCTION + ) { + $linking_url_params['edit_item'] = 1; } } } diff --git a/libraries/special_schema_links.lib.php b/libraries/special_schema_links.lib.php index 36d747e26e..8fdd98496d 100644 --- a/libraries/special_schema_links.lib.php +++ b/libraries/special_schema_links.lib.php @@ -49,7 +49,7 @@ $GLOBALS['special_schema_links'] = array( 'db' => array( 'db' => array( 'link_param' => 'db', - 'default_page' => 'index.php' + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] ), 'user' => array( 'link_param' => 'username', @@ -65,9 +65,8 @@ $GLOBALS['special_schema_links'] = array( 'proc' => array( 'db' => array( 'link_param' => 'db', - 'default_page' => 'index.php' + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] ) - ), 'user' => array( 'user' => array( @@ -80,11 +79,14 @@ $GLOBALS['special_schema_links'] = array( ), 'default_page' => 'server_privileges.php' ) - ) ), 'information_schema' => array( 'columns' => array( + 'table_schema' => array( + 'link_param' => 'db', + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] + ), 'table_name' => array( 'link_param' => 'table', 'link_dependancy_params' => array( @@ -93,7 +95,7 @@ $GLOBALS['special_schema_links'] = array( 'column_name' => 'table_schema' ) ), - 'default_page' => 'index.php' + 'default_page' => $GLOBALS['cfg']['DefaultTabTable'] ), 'column_name' => array( 'link_param' => array( @@ -111,7 +113,25 @@ $GLOBALS['special_schema_links'] = array( 'column_name' => 'table_name' ) ), - 'default_page' => 'index.php' + 'default_page' => 'sql.php' + ) + ), + 'column_privileges' => array( + 'table_schema' => array( + 'link_param' => 'db', + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] + ) + ), + 'events' => array( + 'event_schema' => array( + 'link_param' => 'db', + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] + ) + ), + 'files' => array( + 'table_schema' => array( + 'link_param' => 'db', + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] ) ), 'key_column_usage' => array( @@ -123,7 +143,7 @@ $GLOBALS['special_schema_links'] = array( 'column_name' => 'constraint_schema' ) ), - 'default_page' => 'index.php' + 'default_page' => $GLOBALS['cfg']['DefaultTabTable'] ), 'column_name' => array( 'link_param' => array( @@ -141,11 +161,19 @@ $GLOBALS['special_schema_links'] = array( 'column_name' => 'table_name' ) ), - 'default_page' => 'index.php' + 'default_page' => 'sql.php' + ), + 'constraint_schema' => array( + 'link_param' => 'db', + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] + ), + 'table_schema' => array( + 'link_param' => 'db', + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] ), 'referenced_table_schema' => array( 'link_param' => 'db', - 'default_page' => 'index.php' + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] ), 'referenced_table_name' => array( 'link_param' => 'table', @@ -155,7 +183,7 @@ $GLOBALS['special_schema_links'] = array( 'column_name' => 'referenced_table_schema' ) ), - 'default_page' => 'index.php' + 'default_page' => $GLOBALS['cfg']['DefaultTabTable'] ), 'referenced_column_name' => array( 'link_param' => array( @@ -173,13 +201,19 @@ $GLOBALS['special_schema_links'] = array( 'column_name' => 'referenced_table_name' ) ), - 'default_page' => 'index.php' + 'default_page' => 'sql.php' + ) + ), + 'parameters' => array( + 'specific_schema' => array( + 'link_param' => 'db', + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] ) ), 'partitions' => array( 'table_schema' => array( 'link_param' => 'db', - 'default_page' => 'index.php' + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] ), 'table_name' => array( 'link_param' => 'table', @@ -189,13 +223,13 @@ $GLOBALS['special_schema_links'] = array( 'column_name' => 'table_schema' ) ), - 'default_page' => 'index.php' + 'default_page' => $GLOBALS['cfg']['DefaultTabTable'] ) ), 'processlist' => array( 'db' => array( 'link_param' => 'db', - 'default_page' => 'index.php' + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] ), 'user' => array( 'link_param' => 'username', @@ -211,11 +245,11 @@ $GLOBALS['special_schema_links'] = array( 'referential_constraints' => array( 'constraint_schema' => array( 'link_param' => 'db', - 'default_page' => 'index.php' + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] ), 'unique_constraint_schema' => array( 'link_param' => 'db', - 'default_page' => 'index.php' + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] ), 'table_name' => array( 'link_param' => 'table', @@ -225,7 +259,7 @@ $GLOBALS['special_schema_links'] = array( 'column_name' => 'constraint_schema' ) ), - 'default_page' => 'index.php' + 'default_page' => $GLOBALS['cfg']['DefaultTabTable'] ), 'referenced_table_name' => array( 'link_param' => 'table', @@ -235,7 +269,7 @@ $GLOBALS['special_schema_links'] = array( 'column_name' => 'constraint_schema' ) ), - 'default_page' => 'index.php' + 'default_page' => $GLOBALS['cfg']['DefaultTabTable'] ) ), 'routines' => array( @@ -252,18 +286,32 @@ $GLOBALS['special_schema_links'] = array( ) ), 'default_page' => 'db_routines.php' - ) + ), + 'routine_schema' => array( + 'link_param' => 'db', + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] + ), ), 'schemata' => array( 'schema_name' => array( 'link_param' => 'db', - 'default_page' => 'index.php' + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] + ) + ), + 'schema_privileges' => array( + 'table_schema' => array( + 'link_param' => 'db', + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] ) ), 'statistics' => array( 'table_schema' => array( 'link_param' => 'db', - 'default_page' => 'index.php' + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] + ), + 'index_schema' => array( + 'link_param' => 'db', + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] ), 'table_name' => array( 'link_param' => 'table', @@ -273,7 +321,7 @@ $GLOBALS['special_schema_links'] = array( 'column_name' => 'table_schema' ) ), - 'default_page' => 'index.php' + 'default_page' => $GLOBALS['cfg']['DefaultTabTable'] ), 'column_name' => array( 'link_param' => array( @@ -291,7 +339,7 @@ $GLOBALS['special_schema_links'] = array( 'column_name' => 'table_name' ) ), - 'default_page' => 'index.php' + 'default_page' => 'sql.php' ) ), 'tables' => array( @@ -303,7 +351,11 @@ $GLOBALS['special_schema_links'] = array( 'column_name' => 'table_schema' ) ), - 'default_page' => 'index.php' + 'default_page' => $GLOBALS['cfg']['DefaultTabTable'] + ), + 'table_schema' => array( + 'link_param' => 'db', + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] ) ), 'table_constraints' => array( @@ -315,9 +367,33 @@ $GLOBALS['special_schema_links'] = array( 'column_name' => 'table_schema' ) ), - 'default_page' => 'index.php' + 'default_page' => $GLOBALS['cfg']['DefaultTabTable'] + ), + 'constraint_schema' => array( + 'link_param' => 'db', + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] + ), + 'table_schema' => array( + 'link_param' => 'db', + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] ) - ) + ), + 'table_privileges' => array( + 'table_schema' => array( + 'link_param' => 'db', + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] + ) + ), + 'triggers' => array( + 'trigger_schema' => array( + 'link_param' => 'db', + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] + ), + 'event_object_schema' => array( + 'link_param' => 'db', + 'default_page' => $GLOBALS['cfg']['DefaultTabDatabase'] + ) + ), ) );