aboutsummaryrefslogtreecommitdiffstats
path: root/include/network.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-08-10 08:09:02 +0200
committerMario Vavti <mario@mariovavti.com>2017-08-10 08:09:02 +0200
commit0a96cdd950f30974fe0fecf60b214701673dad86 (patch)
treee7ee642601cd4fd980ca6bd2a038d742c77b4369 /include/network.php
parent8ab3a4ebd7fd25fe4b01e92c8d2f4507b0c6ff3d (diff)
downloadvolse-hubzilla-0a96cdd950f30974fe0fecf60b214701673dad86.tar.gz
volse-hubzilla-0a96cdd950f30974fe0fecf60b214701673dad86.tar.bz2
volse-hubzilla-0a96cdd950f30974fe0fecf60b214701673dad86.zip
merge red/master into dev
Diffstat (limited to 'include/network.php')
-rw-r--r--include/network.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/network.php b/include/network.php
index fa49e5765..cd6e980ff 100644
--- a/include/network.php
+++ b/include/network.php
@@ -671,11 +671,12 @@ function parse_xml_string($s,$strict = true) {
libxml_use_internal_errors(true);
$x = @simplexml_load_string($s2);
- if(! $x) {
+ if($x === false) {
logger('libxml: parse: error: ' . $s2, LOGGER_DATA);
- foreach(libxml_get_errors() as $err)
- logger('libxml: parse: ' . $err->code." at ".$err->line.":".$err->column." : ".$err->message, LOGGER_DATA);
-
+ foreach(libxml_get_errors() as $err) {
+ logger('libxml: parse: ' . $err->code . ' at ' . $err->line
+ . ':' . $err->column . ' : ' . $err->message, LOGGER_DATA);
+ }
libxml_clear_errors();
}