Universal-Omega/PortableInfobox
1
0
Fork 0
mirror of https://github.com/Universal-Omega/PortableInfobox.git synced 2024-11-15 20:09:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

DAT-2875 check for empty nodes updated

Browse source
This commit is contained in:
idradm 2015-06-16 13:45:27 +02:00
parent 6ab4e92781
commit 87e83502b8
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
controllers/PortableInfoboxParserTagController.class.php
View file

@ -156,6 +156,7 @@ class PortableInfoboxParserTagController extends WikiaController {
//make sure no whitespaces, prevents side effects
return self::INFOBOX_LAYOUT_PREFIX . $layoutName;
}
return self::INFOBOX_LAYOUT_PREFIX . self::DEFAULT_LAYOUT_NAME;
}

6
services/Helpers/SimpleXmlUtil.php
View file

@ -15,6 +15,7 @@ class SimpleXmlUtil {
if ( is_null( self::$instance ) ) {
self::$instance = new self;
}
return self::$instance;
}
@ -23,11 +24,13 @@ class SimpleXmlUtil {
* Will return empty string for a non-node argument
*
* @param $node
*
* @return string
*/
public function getInnerXML( $node ) {
$innerXML = '';
if ( $node instanceof \SimpleXMLElement ) {
// check for empty nodes, strlen used for "0" strings match
if ( $node instanceof \SimpleXMLElement && ( strlen( (string)$node ) || $node->count() ) ) {
$domElement = dom_import_simplexml( $node );
if ( ( $domElement instanceof \DOMElement ) && ( $domElement->hasChildNodes() ) ) {
@ -36,6 +39,7 @@ class SimpleXmlUtil {
}
}
}
return $innerXML;
}
}