aboutsummaryrefslogtreecommitdiffstats
path: root/include/poller.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-03-19 09:34:39 +0100
committerzottel <github@zottel.net>2012-03-19 09:34:39 +0100
commit6d31e3d6ef56e22ecedccaeb6846b52da501097b (patch)
tree86518b59c0318d8057a1a8503c6354ebaa96dae3 /include/poller.php
parentdf78c9be0bab909dfa8cf196f7aaa4ea3423be8c (diff)
parent283bc51acf479eebd54145eb639c681980f6717b (diff)
downloadvolse-hubzilla-6d31e3d6ef56e22ecedccaeb6846b52da501097b.tar.gz
volse-hubzilla-6d31e3d6ef56e22ecedccaeb6846b52da501097b.tar.bz2
volse-hubzilla-6d31e3d6ef56e22ecedccaeb6846b52da501097b.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/poller.php')
-rwxr-xr-xinclude/poller.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/poller.php b/include/poller.php
index 3bc98e36f..8262c1d60 100755
--- a/include/poller.php
+++ b/include/poller.php
@@ -232,7 +232,7 @@ function poller_run($argv, $argc){
$importer_uid = $contact['uid'];
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+ $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
intval($importer_uid)
);
if(! count($r))