lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3965 from jpfox/patch-2

Browse Source 
Correct pattern to match all odt var tags
This commit is contained in:
Laurent Destailleur 2015-11-12 18:32:45 +01:00
commit 60535086d4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/includes/odtphp/odf.php
View File

@ -284,7 +284,7 @@ IMG;
private function _parse($type='content') private function _parse($type='content')
{ {
// Search all tags fou into condition to complete $this->vars, so we will proceed all tests even if not defined // Search all tags fou into condition to complete $this->vars, so we will proceed all tests even if not defined
$reg='@\[!--\sIF\s([{}a-zA-Z_]+)\s--\]@smU'; $reg='@\[!--\sIF\s([{}a-zA-Z0-9\.\,_]+)\s--\]@smU';
preg_match_all($reg, $this->contentXml, $matches, PREG_SET_ORDER); preg_match_all($reg, $this->contentXml, $matches, PREG_SET_ORDER);
//var_dump($this->vars);exit; //var_dump($this->vars);exit;
foreach($matches as $match) // For each match, if there is no entry into this->vars, we add it foreach($matches as $match) // For each match, if there is no entry into this->vars, we add it