BUG 5358 Trigger wizard encloses all function parameters in single quotes

improving the code
This commit is contained in:
Carlos Pacha
2011-10-17 18:59:52 -04:00
parent f94b3143c5
commit 08af9965e4
2 changed files with 7 additions and 3 deletions

View File

@@ -64,7 +64,8 @@ foreach ( $aInfoFunction as $k => $v ) {
if ((strstr ( $aDataTriggers [$sOptionTrigger], "@@" ))) {
$option = trim($aDataTriggers [$sOptionTrigger]);
} else {
$aDataTriggers [$sOptionTrigger] = str_replace("'", "\'", $aDataTriggers [$sOptionTrigger]);
$aDataTriggers [$sOptionTrigger] =(strstr($aDataTriggers[$sOptionTrigger],'array'))?
str_replace("'", '"', $aDataTriggers[$sOptionTrigger]):str_replace("'", "\'", $aDataTriggers [$sOptionTrigger]);
$option = (is_numeric($aDataTriggers [$sOptionTrigger]))?trim($aDataTriggers [$sOptionTrigger]):
(strstr($aDataTriggers [$sOptionTrigger],"array") )?trim($aDataTriggers [$sOptionTrigger]):"'" . trim($aDataTriggers [$sOptionTrigger]) . "'";
}

View File

@@ -67,8 +67,11 @@ foreach ( $aInfoFunction as $k => $v ) {
if ((strstr ( $aDataTriggers [$sOptionTrigger], "@@" ))) {
$option = $aDataTriggers [$sOptionTrigger];
} else {
$aDataTriggers [$sOptionTrigger] = str_replace("'", "\'", $aDataTriggers [$sOptionTrigger]);
$option = (is_numeric($aDataTriggers [$sOptionTrigger]))?trim($aDataTriggers [$sOptionTrigger]):
$aDataTriggers [$sOptionTrigger] =(strstr($aDataTriggers[$sOptionTrigger],'array'))?
str_replace("'", '"', $aDataTriggers[$sOptionTrigger]):str_replace("'", "\'", $aDataTriggers [$sOptionTrigger]);
$option = (is_numeric($aDataTriggers [$sOptionTrigger]))?trim($aDataTriggers [$sOptionTrigger]):
(strstr($aDataTriggers [$sOptionTrigger],"array") )?trim($aDataTriggers [$sOptionTrigger]):"'" . trim($aDataTriggers [$sOptionTrigger]) . "'";
}
} else {