harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

Browse Source
This commit is contained in:
redmatrix 2016-09-28 02:44:42 -07:00
commit 80b655fa7e
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zotlabs/Module/Channel.php
View File

@ -178,10 +178,11 @@ class Channel extends \Zotlabs\Web\Controller {
if($mid) { if($mid) {
$r = q("SELECT parent AS item_id from item where mid like '%s' and uid = %d $item_normal $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 . '%'), dbesc($mid . '%'),
intval(\App::$profile['profile_uid']) intval(\App::$profile['profile_uid'])
); );
$_SESSION['loadtime'] = datetime_convert();
} }
else { else {
$r = q("SELECT distinct parent AS `item_id`, created from item $r = q("SELECT distinct parent AS `item_id`, created from item

2
Zotlabs/Module/Photo.php
View File

@ -63,7 +63,7 @@ class Photo extends \Zotlabs\Web\Controller {
$d = [ 'imgscale' => $resolution, 'channel_id' => $uid, 'default' => $default, 'data' => '', 'mimetype' => '' ]; $d = [ 'imgscale' => $resolution, 'channel_id' => $uid, 'default' => $default, 'data' => '', 'mimetype' => '' ];
call_hooks('get_profile_photo',$d); call_hooks('get_profile_photo',$d);
$resolution = $d['resolution']; $resolution = $d['imgscale'];
$uid = $d['channel_id']; $uid = $d['channel_id'];
$default = $d['default']; $default = $d['default'];
$data = $d['data']; $data = $d['data'];

2
Zotlabs/Module/Update_channel.php
View File

@ -67,4 +67,4 @@ function get() {
killme(); killme();
} }
} }