aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-04-08 15:30:54 -0700
committerFriendika <info@friendika.com>2011-04-08 15:30:54 -0700
commit6b66ac818364a4cb5592a0f520396a08feab804f (patch)
tree33fceb2f927e25c98b7a2f290354a1b32d387dd8
parent263eb0c45638b34031d1c64493c7ccb0d16db2c4 (diff)
parent0e033eaa433aa44eb1d2ffc96cbd1b26278cebb8 (diff)
downloadvolse-hubzilla-6b66ac818364a4cb5592a0f520396a08feab804f.tar.gz
volse-hubzilla-6b66ac818364a4cb5592a0f520396a08feab804f.tar.bz2
volse-hubzilla-6b66ac818364a4cb5592a0f520396a08feab804f.zip
Merge branch 'fabrixxm-master'
-rw-r--r--boot.php13
1 files changed, 9 insertions, 4 deletions
diff --git a/boot.php b/boot.php
index c55da6480..6dd433fd8 100644
--- a/boot.php
+++ b/boot.php
@@ -2662,14 +2662,19 @@ function extract_item_authors($arr,$uid) {
// pre-quoted, don't put quotes on %s
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),
implode(',',$urls)
);
if(count($r)) {
$ret = array();
- foreach($r as $rr)
- $ret[$rr['url']] = $rr['id'];
+ $authors = array();
+ foreach($r as $rr){
+ if ($rr['network']=='dfrn')
+ $ret[$rr['url']] = $rr['id'];
+ $authors[$r['url']]= $rr;
+ }
+ $a->authors = $authors;
return $ret;
}
}
@@ -2681,7 +2686,7 @@ function item_photo_menu($item){
$a = get_app();
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();
foreach($rr as $r) $authors[$r['url']]= $r;
$a->authors = $authors;