1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-16 03:24:20 +02:00

Prevent e-modal conflict with other modals. (also supports data-modal-target attribute)

This commit is contained in:
Cameron
2020-03-26 15:30:09 -07:00
parent f4b4ba61d5
commit 3173c9c173
2 changed files with 12 additions and 6 deletions

View File

@@ -4308,6 +4308,7 @@ var_dump($select_options);*/
$cnt = 0;
$text = '';
foreach ($fieldarray as $field => $data)
{
@@ -4323,11 +4324,11 @@ var_dump($select_options);*/
*/
//Not found
if((!varset($data['forced']) && !in_array($field, $currentlist)) || varset($data['nolist']))
if((empty($data['forced']) && !in_array($field, $currentlist)) || !empty($data['nolist']))
{
continue;
}
elseif(vartrue($data['type']) != 'method' && !$data['forced'] && !isset($fieldvalues[$field]) && $fieldvalues[$field] !== NULL)
elseif(vartrue($data['type']) != 'method' && empty($data['forced']) && !isset($fieldvalues[$field]) && $fieldvalues[$field] !== null)
{
$text .= "
<td>