Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #617 from kazitanvirahsan/develop 

Template processor setValue() improvements #614
This commit is contained in:
Roman Syroeshko 2015-12-12 21:01:31 +04:00
parent 9f0b437e60 b446a23b61
commit 529edcb68e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/PhpWord/TemplateProcessor.php
View File

@ -144,6 +144,14 @@ 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 . '}';
}
if (!String::isUTF8($replace)) {
$replace = utf8_encode($replace);
}
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,14 +407,6 @@ 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)) {
$replace = utf8_encode($replace);
}
// Note: we can't use the same function for both cases here, because of performance considerations. // Note: we can't use the same function for both cases here, because of performance considerations.
if (self::MAXIMUM_REPLACEMENTS_DEFAULT === $limit) { if (self::MAXIMUM_REPLACEMENTS_DEFAULT === $limit) {
return str_replace($search, $replace, $documentPartXML); return str_replace($search, $replace, $documentPartXML);