Merge remote-tracking branch 'origin/master'

2013-03-22 12:59:37 +01:00 · 2013-03-22 12:59:37 +01:00 · 55f41f051d
commit 55f41f051d
parent 25392b2235 b8af18053f
1 changed files with 4 additions and 1 deletions
--- a/tbl_relation.php
+++ b/tbl_relation.php
@ -605,7 +605,10 @@ if (count($columns) > 0) {
        . '</form>';
 } // end if (we have columns in this table)

-$html_output .= '<div id="index_div" class="ajax" >'. PMA_getHtmlForDisplayIndexes();
+if (PMA_Util::isForeignKeySupported($tbl_storage_engine)) {
+    $html_output .= '<div id="index_div" class="ajax" >'
+        . PMA_getHtmlForDisplayIndexes();
+}
 // Render HTML output
 PMA_Response::getInstance()->addHTML($html_output);