mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-06 13:29:22 +01:00
Add ability to test for blank fields when merging:
{{IF~ #fieldname ~ EMPTY ~ Empty ~Not empty}} or {{IF~#fieldname~~Empty~Not empty}}
This commit is contained in:
parent
40f56f7ad5
commit
cd1f03c761
@ -1436,7 +1436,13 @@ abstract class bo_merge
|
|||||||
{
|
{
|
||||||
if (array_key_exists('$$'.$param[4].'$$',$this->replacements)) $param[4] = $this->replacements['$$'.$param[4].'$$'];
|
if (array_key_exists('$$'.$param[4].'$$',$this->replacements)) $param[4] = $this->replacements['$$'.$param[4].'$$'];
|
||||||
if (array_key_exists('$$'.$param[3].'$$',$this->replacements)) $param[3] = $this->replacements['$$'.$param[3].'$$'];
|
if (array_key_exists('$$'.$param[3].'$$',$this->replacements)) $param[3] = $this->replacements['$$'.$param[3].'$$'];
|
||||||
$replace = preg_match('/'.preg_quote($param[2], '/').'/',$this->replacements['$$'.$param[1].'$$']) ? $param[3] : $param[4];
|
|
||||||
|
$pattern = '/'.preg_quote($param[2], '/').'/';
|
||||||
|
if (strpos($param[0],'$$IF') === 0 && (trim($param[2]) == "EMPTY" || $param[2] === ''))
|
||||||
|
{
|
||||||
|
$pattern = '/^$/';
|
||||||
|
}
|
||||||
|
$replace = preg_match($pattern,$this->replacements['$$'.$param[1].'$$']) ? $param[3] : $param[4];
|
||||||
switch($this->mimetype)
|
switch($this->mimetype)
|
||||||
{
|
{
|
||||||
case 'application/vnd.oasis.opendocument.text': // open office
|
case 'application/vnd.oasis.opendocument.text': // open office
|
||||||
|
Loading…
Reference in New Issue
Block a user