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:
authorNisarg Jhaveri <nisargjhaveri@gmail.com>2015-07-22 13:40:32 +0300
committerNisarg Jhaveri <nisargjhaveri@gmail.com>2015-07-22 13:40:32 +0300
commitceeab34a781cf8533f03d691379e0d811b4673b4 (patch)
tree68203852a6f44c522acc32fb7ebc13a38a1ad384
parentef70037f2bce6d9e1793a2508a1c5e20b8a969ed (diff)
Show form group header properly
It was broken since 431847b39ea32cbd20a7e58117df5029540f0e3c Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
-rw-r--r--libraries/config/FormDisplay.class.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/libraries/config/FormDisplay.class.php b/libraries/config/FormDisplay.class.php
index bfb9cf66cb..725a2ad47c 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -372,8 +372,6 @@ class FormDisplay
$name = PMA_langName($system_path);
$description = PMA_langName($system_path, 'desc', '');
- $htmlOutput = '';
-
$value = $this->_configFile->get($work_path);
$value_default = $this->_configFile->getDefault($system_path);
$value_is_default = false;
@@ -421,12 +419,13 @@ class FormDisplay
break;
case 'group':
// :group:end is changed to :group:end:{unique id} in Form class
+ $htmlOutput = '';
if (/*overload*/mb_substr($field, 7, 4) != 'end:') {
$htmlOutput .= PMA_displayGroupHeader(/*overload*/mb_substr($field, 7));
} else {
PMA_displayGroupFooter();
}
- return;
+ return $htmlOutput;
case 'NULL':
trigger_error("Field $system_path has no type", E_USER_WARNING);
return;
@@ -474,7 +473,7 @@ class FormDisplay
}
$js_default[] = $js_line;
- return $htmlOutput . PMA_displayInput(
+ return PMA_displayInput(
$translated_path, $name, $type, $value,
$description, $value_is_default, $opts
);