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

Fixed gh-458 so that the && is not added if we have no extra values to validate. Added linked to details to Joomla Plugin area.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2019-08-15 16:26:46 +02:00
parent 3a27038164
commit 04ed58afe8
8 changed files with 37 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin/helpers/compiler/a_Get.php
View File

@ -108,7 +108,7 @@ class Get
*/
public $componentData;
/* * *********************************************************************************************
/**
* The custom script placeholders - we use the (xxx) to avoid detection it should be (***)
* ##################################---> PHP/JS <---####################################
*
@ -140,7 +140,7 @@ class Get
* ////////23 is the ID of the code in the system don't change it!!!!!!!!!!!!!!!!!!!!!!!!!!
*
* @var array
* ********************************************************************************************* */
*/
protected $customCodePlaceholders = array(
1 => 'REPLACE<>$$$$]',
2 => 'INSERT<>$$$$]',

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

@ -10684,15 +10684,13 @@ class Interpretation extends Fields
$ifArray[$task['task_name']][] = "\$" . $task['value_name'] . "Value";
}
// see user check is needed
if (isset($task['user_check']) && 1 == $task['user_check'])
if (!isset($userCheck[$task['task_name']]) && isset($task['user_check']) && 1 == $task['user_check'])
{
// add it since this means it was not set, and in the old method we assumed it was inplace
// or it is set and 1 means we still want it inplace
$userCheck[$task['task_name']] = ' && $user->id != 0';
}
else
{
$userCheck[$task['task_name']] = '';
$ifArray[$task['task_name']][] = '$user->id != 0';
// add it only once
$userCheck[$task['task_name']] = true;
}
}
}
@ -10715,17 +10713,9 @@ class Interpretation extends Fields
// check if we have some values to check
if (isset($ifArray[$task]) && ComponentbuilderHelper::checkArray($ifArray[$task]))
{
// set if string
$ifvalues = implode(' && ', $ifArray[$task]);
}
else
{
$ifvalues = '';
}
// build the if string
$ifvalues = $ifvalues . $userCheck[$task];
// check if we have a if string
if (ComponentbuilderHelper::checkString($ifvalues))
{
// add to case
$cases .= PHP_EOL . $this->_t(6) . "if(" . $ifvalues . ")";
$cases .= PHP_EOL . $this->_t(6) . "{";
$cases .= PHP_EOL . $this->_t(7) . $getMethod;