diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | libraries/navigation/NavigationHeader.class.php | 24 | ||||
| -rw-r--r-- | libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php | 2 |
3 files changed, 12 insertions, 15 deletions
@@ -78,6 +78,7 @@ explanation - 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/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( - '/<img[^>]+>/i', - __('Documentation'), - PMA_Util::showMySQLDocu('', true) - ); - $retval .= $link; - $retval .= '<br />'; - } + $retval .= PMA_Util::getNavigationLink( + PMA_Util::getMySQLDocuURL('', ''), + $showText, + __('Documentation'), + $showIcon, + 'b_sqlhelp.png', + '', + false, + 'mysql_doc' + ); $retval .= PMA_Util::getNavigationLink( '#', $showText, diff --git a/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php b/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php index 55afe3b7f7..994ee43d11 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] ); } } |