diff options
| author | redmatrix <mike@macgirvin.com> | 2016-09-28 02:44:42 -0700 |
|---|---|---|
| committer | redmatrix <mike@macgirvin.com> | 2016-09-28 02:44:42 -0700 |
| commit | 80b655fa7eea194c458546edb6c3d534c46eccb9 (patch) | |
| tree | 8366707ec47161df02e2fa13dbaa3e1d0f4aef7d | |
| parent | db95e6eba597cbe51ba7c328fa921787cab46f6e (diff) | |
| parent | f0e8c9ead9502acf111f524b9a9232a3f0e2fa70 (diff) | |
| download | volse-hubzilla-80b655fa7eea194c458546edb6c3d534c46eccb9.tar.gz volse-hubzilla-80b655fa7eea194c458546edb6c3d534c46eccb9.tar.bz2 volse-hubzilla-80b655fa7eea194c458546edb6c3d534c46eccb9.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
| -rw-r--r-- | Zotlabs/Module/Channel.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Photo.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Update_channel.php | 2 |
3 files changed, 4 insertions, 3 deletions
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/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']; 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 +} |