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

Merge remote-tracking branch 'upstream/dev' into website-import

Browse Source
This commit is contained in:
Andrew Manning 2016-07-20 21:22:53 -04:00
commit d504197a78
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Acl.php
View File

@ -222,7 +222,7 @@ class Acl extends \Zotlabs\Web\Controller {
} }
elseif($type == 'm') { elseif($type == 'm') {
$r = q("SELECT xchan_hash as id, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url $r = q("SELECT xchan_hash as hash, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url
FROM abook left join xchan on abook_xchan = xchan_hash FROM abook left join xchan on abook_xchan = xchan_hash
WHERE abook_channel = %d and ( (abook_their_perms = null) or (abook_their_perms & %d )>0) WHERE abook_channel = %d and ( (abook_their_perms = null) or (abook_their_perms & %d )>0)
and xchan_deleted = 0 and xchan_deleted = 0

4
Zotlabs/Zot/Finger.php
View File

@ -28,7 +28,7 @@ class Finger {
if (strpos($webbie,'@') === false) { if (strpos($webbie,'@') === false) {
$address = $webbie; $address = $webbie;
$host = App::get_hostname(); $host = \App::get_hostname();
} else { } else {
$address = substr($webbie,0,strpos($webbie,'@')); $address = substr($webbie,0,strpos($webbie,'@'));
$host = substr($webbie,strpos($webbie,'@')+1); $host = substr($webbie,strpos($webbie,'@')+1);
@ -127,4 +127,4 @@ class Finger {
return $x; return $x;
} }
} }