From d92e9f38f8dce6b24d39e24b2ec2584abac0e6d3 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 28 Sep 2016 11:04:02 +0200
Subject: fix with update with /channel?f=&mid=hash issue #461

---
 Zotlabs/Module/Channel.php        | 3 ++-
 Zotlabs/Module/Update_channel.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'Zotlabs')

diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 795f0869a..209d86236 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -178,10 +178,11 @@ class Channel extends \Zotlabs\Web\Controller {
 
 			if($mid) {
 				$r = q("SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal
-					AND item_wall = 1 AND item_unseen = 1 $sql_extra limit 1",
+					AND item_wall = 1 $simple_update $sql_extra limit 1",
 					dbesc($mid . '%'),
 					intval(\App::$profile['profile_uid'])
 				);
+				$_SESSION['loadtime'] = datetime_convert();
 			} 
 			else {
 				$r = q("SELECT distinct parent AS `item_id`, created from item
diff --git a/Zotlabs/Module/Update_channel.php b/Zotlabs/Module/Update_channel.php
index b1b2d5103..46ad19805 100644
--- a/Zotlabs/Module/Update_channel.php
+++ b/Zotlabs/Module/Update_channel.php
@@ -67,4 +67,4 @@ function get() {
 	killme();
 
 }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From f0e8c9ead9502acf111f524b9a9232a3f0e2fa70 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 28 Sep 2016 11:13:30 +0200
Subject: fix wrong array key for profile photo resloution

---
 Zotlabs/Module/Photo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Zotlabs')

diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index d37ae07ac..4332fd6e9 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -63,7 +63,7 @@ class Photo extends \Zotlabs\Web\Controller {
 			$d = [ 'imgscale' => $resolution, 'channel_id' => $uid, 'default' => $default, 'data'  => '', 'mimetype' => '' ];
 			call_hooks('get_profile_photo',$d);
 
-			$resolution = $d['resolution'];
+			$resolution = $d['imgscale'];
 			$uid        = $d['channel_id']; 	
 			$default    = $d['default'];
 			$data       = $d['data'];
-- 
cgit v1.2.3