1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-12 09:34:54 +02:00

Fixes #4083 Column selector displaying improperly defined field.

Admin-UI: Multi-language database language only displays when a table match is found.
This commit is contained in:
Cameron
2020-02-22 10:03:41 -08:00
parent 79c5b3e694
commit d23c65b30c
4 changed files with 52 additions and 34 deletions

View File

@@ -4065,7 +4065,7 @@ var_dump($select_options);*/
return $def_options;
}
function columnSelector($columnsArray, $columnsDefault = '', $id = 'column_options')
function columnSelector($columnsArray, $columnsDefault = array(), $id = 'column_options')
{
$columnsArray = array_filter($columnsArray);
@@ -4083,16 +4083,16 @@ var_dump($select_options);*/
foreach($columnsArray as $key => $fld)
{
if(!isset($fld['type']) || $fld['type'] === null) // Fixes #4083
{
continue;
}
if (empty($fld['forced']) && empty($fld['nolist']) && vartrue($fld['type'])!='hidden' && vartrue($fld['type'])!='upload')
{
$checked = (in_array($key,$columnsDefault)) ? TRUE : FALSE;
$ttl = isset($fld['title']) ? defset($fld['title'], $fld['title']) : $key;
// $text .= "
// <div class='field-spacer'>
// ".$this->checkbox_label($ttl, 'e-columns[]', $key, $checked)."
// </div>
// ";
//
$text .= "
<li role='menuitem'><a href='#'>
".$this->checkbox('e-columns[]', $key, $checked,'label='.$ttl)."