Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRouslan Placella <rouslan@placella.com>2012-11-08 16:48:04 +0400
committerRouslan Placella <rouslan@placella.com>2012-11-09 17:23:51 +0400
commit82bcf5f7947938b479166fb97c6af3ca52759bcf (patch)
tree4b80db611b3f7de78b2886f7ed3095753b5667fe /server_variables.php
parent8cf17cee5e7db97a1d3ee6bb9aff3e7bf72e25d7 (diff)
Moved documentation links to first column in server_variables.php
Diffstat (limited to 'server_variables.php')
-rw-r--r--server_variables.php37
1 files changed, 16 insertions, 21 deletions
diff --git a/server_variables.php b/server_variables.php
index 048b50e3be..58977cd2bc 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -157,7 +157,6 @@ $output .= '<table id="serverVariables" class="data filteredData noclick">'
. '<th class="valueHeader">'
. __('Session value') . ' / ' . __('Global value')
. '</th>'
- . '<th>' . __('Documentation') . '</th>'
. '</tr>'
. '</thead>'
. '<tbody>';
@@ -170,34 +169,30 @@ foreach ($serverVars as $name => $value) {
. ($has_session_value ? 'diffSession' : '');
$output .= '<tr class="' . $row_class . '">'
- . '<th class="nowrap">' . htmlspecialchars(str_replace('_', ' ', $name))
- . '</th>'
+ . '<th class="nowrap">' . htmlspecialchars(str_replace('_', ' ', $name));
+
+ // To display variable documentation link
+ if (isset($VARIABLE_DOC_LINKS[$name])) {
+ $output .= PMA_Util::showMySQLDocu(
+ $VARIABLE_DOC_LINKS[$name][1],
+ $VARIABLE_DOC_LINKS[$name][1],
+ false,
+ $VARIABLE_DOC_LINKS[$name][2] . '_' . $VARIABLE_DOC_LINKS[$name][0]
+ );
+ }
+
+ $output .= '</th>'
. '<td class="value' . (PMA_isSuperuser() ? ' editable' : '') . '">'
. formatVariable($name, $value)
- . '</td>'
- . '<td class="value">';
-
- // To display variable documentation link
- if (isset($VARIABLE_DOC_LINKS[$name])) {
- $output .= PMA_Util::showMySQLDocu(
- $VARIABLE_DOC_LINKS[$name][1],
- $VARIABLE_DOC_LINKS[$name][1],
- false,
- $VARIABLE_DOC_LINKS[$name][2] . '_' . $VARIABLE_DOC_LINKS[$name][0]
- );
- }
-
- $output .= '</td>';
+ . '</td></tr>';
if ($has_session_value) {
- $output .= '</tr>'
- . '<tr class="' . ($odd_row ? 'odd' : 'even') . '">'
+ $output .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">'
. '<td>(' . __('Session value') . ')</td>'
. '<td class="value">' . formatVariable($name, $serverVarsSession[$name]) . '</td>'
- . '<td class="value"></td>';
+ . '</tr>';
}
- $output .= '</tr>';
$odd_row = ! $odd_row;
}
$output .= '</tbody>'