aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-12-30 22:56:52 -0800
committerfriendica <info@friendica.com>2012-12-30 22:56:52 -0800
commit83db4abaab1cebff5c76a1cff4606f495bb7246e (patch)
treec0020c393fc2266a5473bfee9efdb492f3df3dd3
parent15938289e2173f1abec33288de13fdbd9176ce0e (diff)
downloadvolse-hubzilla-83db4abaab1cebff5c76a1cff4606f495bb7246e.tar.gz
volse-hubzilla-83db4abaab1cebff5c76a1cff4606f495bb7246e.tar.bz2
volse-hubzilla-83db4abaab1cebff5c76a1cff4606f495bb7246e.zip
fixes
-rw-r--r--include/onepoll.php2
-rw-r--r--include/poller.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/onepoll.php b/include/onepoll.php
index d6d06eda1..131f02fad 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -31,7 +31,7 @@ function onepoll_run($argv, $argc){
$contacts = q("SELECT abook.*, xchan.*, account.*
- FROM abook LEFT JOIN account on abook_account = account_id left join xchan on xchan_hash = abook_hash
+ FROM abook LEFT JOIN account on abook_account = account_id left join xchan on xchan_hash = abook_xchan
where abook_id = %d
AND not ( abook_flags & %d ) AND not ( abook_flags & %d )
AND not ( abook_flags & %d ) AND not ( abook_flags & %d )
diff --git a/include/poller.php b/include/poller.php
index 1eba918e8..3052ace64 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -50,7 +50,7 @@ function poller_run($argv, $argc){
if($d2 != intval($d1)) {
- update_suggestions();
+// update_suggestions();
set_config('system','last_expire_day',$d2);
proc_run('php','include/expire.php');