gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1810 from nisargjhaveri/fix_empty_return

Browse Source 
Show form group header properly in settings forms
This commit is contained in:
Marc Delisle 2015-07-22 05:51:45 -07:00
commit 0875febff3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/config/FormDisplay.class.php
View File

@ -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
);