Aix/PHPWord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Template processor setValue() improvements #614

Browse Source
This commit is contained in:
kazi Tanvir Ahsan 2015-09-10 23:33:02 +10:00
parent 3a58c818bd
commit a123ce41e5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/PhpWord/TemplateProcessor.php
View File

@ -144,6 +144,10 @@ class TemplateProcessor
*/ */
public function setValue($macro, $replace, $limit = self::MAXIMUM_REPLACEMENTS_DEFAULT) public function setValue($macro, $replace, $limit = self::MAXIMUM_REPLACEMENTS_DEFAULT)
{ {
if (substr($macro, 0, 2) !== '${' && substr($macro, -1) !== '}') {
$macro = '${' . $macro . '}';
}
foreach ($this->tempDocumentHeaders as $index => $headerXML) { foreach ($this->tempDocumentHeaders as $index => $headerXML) {
$this->tempDocumentHeaders[$index] = $this->setValueForPart($this->tempDocumentHeaders[$index], $macro, $replace, $limit); $this->tempDocumentHeaders[$index] = $this->setValueForPart($this->tempDocumentHeaders[$index], $macro, $replace, $limit);
} }
@ -399,10 +403,7 @@ class TemplateProcessor
*/ */
protected function setValueForPart($documentPartXML, $search, $replace, $limit) protected function setValueForPart($documentPartXML, $search, $replace, $limit)
{ {
if (substr($search, 0, 2) !== '${' && substr($search, -1) !== '}') {
$search = '${' . $search . '}';
}
if (!String::isUTF8($replace)) { if (!String::isUTF8($replace)) {
$replace = utf8_encode($replace); $replace = utf8_encode($replace);
} }