friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge branch 'fabrixxm-master'

This commit is contained in:
Friendika 2011-04-08 15:30:54 -07:00
parent 263eb0c456 0e033eaa43
commit 6b66ac8183
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
boot.php
View File

@ -2662,14 +2662,19 @@ function extract_item_authors($arr,$uid) {
// pre-quoted, don't put quotes on %s // pre-quoted, don't put quotes on %s
if(count($urls)) { if(count($urls)) {
$r = q("SELECT `id`,`url` FROM `contact` WHERE `uid` = %d AND `url` IN ( %s ) AND `network` = 'dfrn' AND `self` = 0 AND `blocked` = 0 ", $r = q("SELECT `id`,`network`,`url` FROM `contact` WHERE `uid` = %d AND `url` IN ( %s ) AND `self` = 0 AND `blocked` = 0 ",
intval($uid), intval($uid),
implode(',',$urls) implode(',',$urls)
); );
if(count($r)) { if(count($r)) {
$ret = array(); $ret = array();
foreach($r as $rr) $authors = array();
$ret[$rr['url']] = $rr['id']; foreach($r as $rr){
if ($rr['network']=='dfrn')
$ret[$rr['url']] = $rr['id'];
$authors[$r['url']]= $rr;
}
$a->authors = $authors;
return $ret; return $ret;
} }
} }
@ -2681,7 +2686,7 @@ function item_photo_menu($item){
$a = get_app(); $a = get_app();
if (!isset($a->authors)){ if (!isset($a->authors)){
$rr = q("SELECT id, network, url FROM contact WHERE uid=%d AND self!=1", intval(local_user())); $rr = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `uid`=%d AND `self`=0 AND `blocked`=0 ", intval(local_user()));
$authors = array(); $authors = array();
foreach($rr as $r) $authors[$r['url']]= $r; foreach($rr as $r) $authors[$r['url']]= $r;
$a->authors = $authors; $a->authors = $authors;