From 7c60701efc091945dd2ee14728263d8dae0f88b0 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Fri, 10 Jun 2011 01:51:14 -0700
Subject: fixed a few feed problems affecting activity objects/targets

---
 boot.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 8e8a2bc21..b94000b60 100644
--- a/boot.php
+++ b/boot.php
@@ -2788,16 +2788,23 @@ function lang_selector() {
 
 
 if(! function_exists('parse_xml_string')) {
-function parse_xml_string($s) {
-	if(! strstr($s,'<?xml'))
-		return false;
-	$s2 = substr($s,strpos($s,'<?xml'));
+function parse_xml_string($s,$strict = true) {
+	if($strict) {
+		if(! strstr($s,'<?xml'))
+			return false;
+		$s2 = substr($s,strpos($s,'<?xml'));
+	}
+	else
+		$s2 = $s;
 	libxml_use_internal_errors(true);
+
 	$x = @simplexml_load_string($s2);
-	if(count(libxml_get_errors()))
+	if(! $x) {
+		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);
-	libxml_clear_errors();
+		libxml_clear_errors();
+	}
 	return $x;
 }}
 
-- 
cgit v1.2.3