Merge remote branch 'origin/master'

libraries/common.lib.php

@@ -1936,8 +1936,8 @@ function PMA_checkParameters($params, $die = true, $request = true)
         if (!isset($GLOBALS[$param])) {
             $error_message .= $reported_script_name
                 . ': Missing parameter: ' . $param
-                . ' <a href="./Documentation.html#faqmissingparameters"'
-                . ' target="documentation"> (FAQ 2.8)</a><br />';
+                . PMA_showDocu('faqmissingparameters')
+                . '<br />';
             $found_error = true;
         }
     }

tbl_indexes.php

@@ -156,9 +156,11 @@ echo PMA_generate_common_hidden_inputs($form_params);
 <fieldset>
     <legend>
 <?php
-echo (isset($_REQUEST['create_index'])
-    ? __('Create a new index')
-    : __('Modify an index');
+if (isset($_REQUEST['create_index'])) {
+    echo __('Create a new index');
+} else {
+    echo __('Modify an index');
+}
 ?>
     </legend>