From 610e3c76a203c3b2252cb6df1f2ff5925c0f3295 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 19 Mar 2015 17:59:02 +0530 Subject: [PATCH 1/2] bug #4804 Undefined Index after export schema Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e9e39409e1..2c533497b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - bug #4807 Breaks when sorting by multiple columns while using UNION - bug #4798 Missing column when exporting in sql - bug #4810 Broken find and replace +- bug #4804 Undefined Index after export schema 4.3.12.0 (2015-03-14) - bug #4746 Right-aligned columns have left-aligned header diff --git a/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php b/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php index 2b4350f975..fbf48c0cc1 100644 --- a/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php +++ b/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php @@ -584,7 +584,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $one_table, $one_field, $one_key['ref_table_name'], - $rel['foreign_field'][$index] + $one_key['ref_index_list'][$index] ); } } From a9220d89cfd308fe9e29c7c9b7e88895c908877b Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 19 Mar 2015 18:26:35 +0530 Subject: [PATCH 2/2] Fix missing title for MySQL documentation Signed-off-by: Madhura Jayaratne --- .../navigation/NavigationHeader.class.php | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/libraries/navigation/NavigationHeader.class.php b/libraries/navigation/NavigationHeader.class.php index 61ede894cb..3f0cab2924 100644 --- a/libraries/navigation/NavigationHeader.class.php +++ b/libraries/navigation/NavigationHeader.class.php @@ -176,20 +176,16 @@ class PMA_NavigationHeader false, 'documentation' ); - if ($showIcon) { - $retval .= PMA_Util::showMySQLDocu('', true); - } - if ($showText) { - // PMA_showMySQLDocu always spits out an icon, - // we just replace it with some perl regexp. - $link = preg_replace( - '/]+>/i', - __('Documentation'), - PMA_Util::showMySQLDocu('', true) - ); - $retval .= $link; - $retval .= '
'; - } + $retval .= PMA_Util::getNavigationLink( + PMA_Util::getMySQLDocuURL('', ''), + $showText, + __('Documentation'), + $showIcon, + 'b_sqlhelp.png', + '', + false, + 'mysql_doc' + ); $retval .= PMA_Util::getNavigationLink( '#', $showText,