mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-24 20:01:36 +02:00
Handle escaped curly bracket placeholders in rtf
This commit is contained in:
parent
b0a8cebc69
commit
1ae125f08e
@ -682,6 +682,12 @@ abstract class bo_merge
|
|||||||
// agressivly removing all xml-tags eg. Word adds within placeholders
|
// agressivly removing all xml-tags eg. Word adds within placeholders
|
||||||
$content = preg_replace_callback('/{{[^}]+}}/i',create_function('$p','return \'$$\'.strip_tags(substr($p[0],2,-2)).\'$$\';'),$content);
|
$content = preg_replace_callback('/{{[^}]+}}/i',create_function('$p','return \'$$\'.strip_tags(substr($p[0],2,-2)).\'$$\';'),$content);
|
||||||
|
|
||||||
|
// Handle escaped placeholder markers in RTF, they won't match when escaped
|
||||||
|
if($mimetype == 'application/rtf')
|
||||||
|
{
|
||||||
|
$content = preg_replace('/\\\{\\\{([^\\}]+)\\\}\\\}/i','$$\1$$',$content);
|
||||||
|
}
|
||||||
|
|
||||||
// make currently processed mimetype available to class methods;
|
// make currently processed mimetype available to class methods;
|
||||||
$this->mimetype = $mimetype;
|
$this->mimetype = $mimetype;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user