From 6531cbd1d286738acb9448b141bf4d7d5f97ccf3 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 9 Aug 2017 17:35:03 -0700
Subject: [PATCH] libxml errors

---
 Zotlabs/Lib/ThreadItem.php   | 1 -
 Zotlabs/Lib/ThreadStream.php | 1 +
 include/conversation.php     | 2 +-
 include/network.php          | 9 +++++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 3e76890b6..4a66c84bc 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -713,7 +713,6 @@ class ThreadItem {
 		call_hooks('comment_buttons',$arr);
 		$comment_buttons = $arr['comment_buttons'];
 
-
 		$comment_box = replace_macros($template,array(
 			'$return_path' => '',
 			'$threaded' => $this->is_threaded(),
diff --git a/Zotlabs/Lib/ThreadStream.php b/Zotlabs/Lib/ThreadStream.php
index 1fd746c38..35ccf4fdb 100644
--- a/Zotlabs/Lib/ThreadStream.php
+++ b/Zotlabs/Lib/ThreadStream.php
@@ -18,6 +18,7 @@ class ThreadStream {
 	private $observer = null;
 	private $writable = false;
 	private $commentable = false;
+	private $uploadable = false;
 	private $profile_owner = 0;
 	private $preview = false;
 	private $prepared_item = '';
diff --git a/include/conversation.php b/include/conversation.php
index 13ae571d6..f15077e76 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -538,7 +538,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
 	}
 
 	elseif ($mode === 'photos') {
-		$profile_onwer = App::$profile['profile_uid'];
+		$profile_owner = App::$profile['profile_uid'];
 		$page_writeable = ($profile_owner == local_channel());
 		$live_update_div = '<div id="live-photos"></div>' . "\r\n";
 		// for photos we've already formatted the top-level item (the photo)
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();
 	}