joomla/Component-Builder
39
25
Fork 11
Code Issues 75 Pull Requests Projects 4 Wiki Activity

Fixed Warning: Invalid argument supplied for foreach() in ../html/libraries/cms/html/select.php on line 592 by adding empty select option.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2020-12-07 17:44:16 +02:00
parent dfbd2b2a6d
commit 4d0097f8e4
38 changed files with 122 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
admin/helpers/compiler/e_Interpretation.php
View File

@ -17645,28 +17645,26 @@ class Interpretation extends Fields
$function[] = $this->_t(2) . "\$db->setQuery(\$query);";
$function[] = PHP_EOL . $this->_t(2)
. "\$results = \$db->loadObjectList();";
$function[] = $this->_t(2) . "if (\$results)";
$function[] = $this->_t(2) . "{";
$function[] = $this->_t(3) . "\$filter = array();";
$function[] = $this->_t(3) . "\$batch = array();";
$function[] = $this->_t(2) . "\$_filter = array();";
// if this is not a multi field
if (!$funtion_path && $filter['multi'] == 1)
{
$function[] = $this->_t(4)
. "\$filter[] = JHtml::_('select.option', '', '- Select ' . JText:"
$function[] = $this->_t(2)
. "\$_filter[] = JHtml::_('select.option', '', '- Select ' . JText:"
. ":_('" . $filter['lang'] . "') . ' -');";
}
$function[] = $this->_t(2) . "if (\$results)";
$function[] = $this->_t(2) . "{";
$function[] = $this->_t(3)
. "foreach (\$results as \$result)";
$function[] = $this->_t(3) . "{";
$function[] = $this->_t(4)
. "\$filter[] = JHtml::_('select.option', \$result->"
. "\$_filter[] = JHtml::_('select.option', \$result->"
. $filter['custom']['id'] . ", \$result->"
. $filter['custom']['text'] . ");";
$function[] = $this->_t(3) . "}";
$function[] = $this->_t(3) . "return \$filter;";
$function[] = $this->_t(2) . "}";
$function[] = $this->_t(2) . "return false;";
$function[] = $this->_t(2) . "return \$_filter;";
// add if this is a function path
if ($funtion_path)
{
@ -17799,7 +17797,14 @@ class Interpretation extends Fields
$function[] = PHP_EOL . $this->_t(2)
. "\$results = \$db->loadColumn();";
}
$function[] = $this->_t(2) . "\$_filter = array();";
// if this is not a multi field
if (!$funtion_path && $filter['multi'] == 1)
{
$function[] = $this->_t(2)
. "\$_filter[] = JHtml::_('select.option', '', '- ' . JText:"
. ":_('" . $filter['lang_select'] . "') . ' -');";
}
$function[] = PHP_EOL . $this->_t(2) . "if (\$results)";
$function[] = $this->_t(2) . "{";
@ -17827,14 +17832,6 @@ class Interpretation extends Fields
$function[] = $this->_t(3)
. "\$results = array_unique(\$results);";
}
$function[] = $this->_t(3) . "\$_filter = array();";
// if this is not a multi field
if (!$funtion_path && $filter['multi'] == 1)
{
$function[] = $this->_t(3)
. "\$_filter[] = JHtml::_('select.option', '', '- ' . JText:"
. ":_('" . $filter['lang_select'] . "') . ' -');";
}
$function[] = $this->_t(3) . "foreach (\$results as \$"
. $filter['code'] . ")";
$function[] = $this->_t(3) . "{";
@ -17894,9 +17891,8 @@ class Interpretation extends Fields
}
}
$function[] = $this->_t(3) . "}";
$function[] = $this->_t(3) . "return \$_filter;";
$function[] = $this->_t(2) . "}";
$function[] = $this->_t(2) . "return false;";
$function[] = $this->_t(2) . "return \$_filter;";
// add if this is a function path
if ($funtion_path)
{