Merge branch 'QA_4_4'

phpmyadmin · Mar 19, 2015 · 14d5a7b · 14d5a7b
2 parents 31d6a28 + a9220d8
commit 14d5a7b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -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
@@ -176,20 +176,16 @@ private function _links()
             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
@@ -584,7 +584,7 @@ function __construct()
                             $one_table,
                             $one_field,
                             $one_key['ref_table_name'],
-                            $rel['foreign_field'][$index]
+                            $one_key['ref_index_list'][$index]
                         );
                     }
                 }