diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-19 03:41:26 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-19 03:41:26 -0400 |
| commit | 236eaf6ed09df34e62cf487712d909cb8a3b35d1 (patch) | |
| tree | 86518b59c0318d8057a1a8503c6354ebaa96dae3 /include/poller.php | |
| parent | 5e2a9c99a64dc75dd70320859b093d132e823f1f (diff) | |
| parent | 283bc51acf479eebd54145eb639c681980f6717b (diff) | |
| download | volse-hubzilla-236eaf6ed09df34e62cf487712d909cb8a3b35d1.tar.gz volse-hubzilla-236eaf6ed09df34e62cf487712d909cb8a3b35d1.tar.bz2 volse-hubzilla-236eaf6ed09df34e62cf487712d909cb8a3b35d1.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier
community discovery cont., cleanup of DB debugging
* master:
Diffstat (limited to 'include/poller.php')
| -rwxr-xr-x | include/poller.php | 2 |
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)) |