From 2ea87b65ca4aeab08e68a4e5cd1fd940ae470146 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 24 Apr 2018 15:41:35 +0200
Subject: fix php warnings

---
 Zotlabs/Module/Photos.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Zotlabs')

diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index fa22c3f26..a143c4d4c 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -1148,10 +1148,10 @@ class Photos extends \Zotlabs\Web\Controller {
 						builtin_activity_puller($item, $conv_responses);
 					}
 	
-	
 					$like_count = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid']] : '');
 					$like_list = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid'] . '-l'] : '');
-					if (count($like_list) > MAX_LIKERS) {
+
+					if(is_array($like_list) && (count($like_list) > MAX_LIKERS)) {
 						$like_list_part = array_slice($like_list, 0, MAX_LIKERS);
 						array_push($like_list_part, '<a href="#" data-toggle="modal" data-target="#likeModal-' . $this->get_id() . '"><b>' . t('View all') . '</b></a>');
 					} else {
@@ -1163,7 +1163,7 @@ class Photos extends \Zotlabs\Web\Controller {
 						$dislike_count = ((x($dlike,$link_item['mid'])) ? $dlike[$link_item['mid']] : '');
 						$dislike_list = ((x($dlike,$link_item['mid'])) ? $dlike[$link_item['mid'] . '-l'] : '');
 						$dislike_button_label = tt('Dislike','Dislikes',$dislike_count,'noun');
-						if (count($dislike_list) > MAX_LIKERS) {
+						if (is_array($dislike_list) && (count($dislike_list) > MAX_LIKERS)) {
 							$dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS);
 							array_push($dislike_list_part, '<a href="#" data-toggle="modal" data-target="#dislikeModal-' . $this->get_id() . '"><b>' . t('View all') . '</b></a>');
 						} else {
-- 
cgit v1.2.3


From e11e99b2d1e2d94417e9f9934b759c88a70177ac Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 24 Apr 2018 17:09:51 +0200
Subject: fix regression with forum widget unseen count

---
 Zotlabs/Widget/Forums.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Zotlabs')

diff --git a/Zotlabs/Widget/Forums.php b/Zotlabs/Widget/Forums.php
index f65a639ff..7415c0f0a 100644
--- a/Zotlabs/Widget/Forums.php
+++ b/Zotlabs/Widget/Forums.php
@@ -66,8 +66,8 @@ class Forums {
 		for($x = 0; $x < count($r1); $x ++) {
 			$r = q("select sum(item_unseen) as unseen from item 
 				where uid = %d and owner_xchan = '%s' and item_unseen = 1 $perms_sql ",
-				dbesc($r1[$x]['xchan_hash']),
-				intval(local_channel())
+				intval(local_channel()),
+				dbesc($r1[$x]['xchan_hash'])
 			);
 			if($r)
 				$r1[$x]['unseen'] = $r[0]['unseen'];
-- 
cgit v1.2.3