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

Properly fixing #257 and helps out on #324

Browse Source
This commit is contained in:
Gareth Ellis 2016-02-04 13:40:16 +00:00
parent 995dc68706
commit a68634c3f1
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/PhpWord/Shared/Html.php
View File

@ -177,13 +177,11 @@ class Html
$cNodes = $node->childNodes; $cNodes = $node->childNodes;
if (count($cNodes) > 0) { if (count($cNodes) > 0) {
foreach ($cNodes as $cNode) { foreach ($cNodes as $cNode) {
if ($element instanceof AbstractContainer) {
self::parseNode($cNode, $element, $styles, $data); self::parseNode($cNode, $element, $styles, $data);
} }
} }
} }
} }
}
/** /**
* Parse paragraph node * Parse paragraph node
@ -232,11 +230,9 @@ class Html
{ {
$styles['font'] = self::parseInlineStyle($node, $styles['font']); $styles['font'] = self::parseInlineStyle($node, $styles['font']);
// Commented as source of bug #257. `method_exists` doesn't seems to work properly in this case. if( is_callable(array($element, 'addText')) ) {
// @todo Find better error checking for this one
// if (method_exists($element, 'addText')) {
$element->addText($node->nodeValue, $styles['font'], $styles['paragraph']); $element->addText($node->nodeValue, $styles['font'], $styles['paragraph']);
// } }
return null; return null;
} }