diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-21 21:14:54 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-21 21:14:54 -0400 |
| commit | 5a63ddd6457ae4dba61ff30db5b6601b22ddd1b6 (patch) | |
| tree | 84b9b847f384c42a462a0035142b4b5757906922 /Zotlabs/Daemon | |
| parent | d504197a786eb46a780278fccb529daa13bfa443 (diff) | |
| parent | 8566f9130395ecdbe19f9fce85a26dac39d9fe24 (diff) | |
| download | volse-hubzilla-5a63ddd6457ae4dba61ff30db5b6601b22ddd1b6.tar.gz volse-hubzilla-5a63ddd6457ae4dba61ff30db5b6601b22ddd1b6.tar.bz2 volse-hubzilla-5a63ddd6457ae4dba61ff30db5b6601b22ddd1b6.zip | |
Merge remote-tracking branch 'upstream/dev' into website-import
Diffstat (limited to 'Zotlabs/Daemon')
| -rw-r--r-- | Zotlabs/Daemon/Cron.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Onepoll.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php index 5af8174bf..c6e82b13a 100644 --- a/Zotlabs/Daemon/Cron.php +++ b/Zotlabs/Daemon/Cron.php @@ -66,7 +66,7 @@ class Cron { q("delete from atoken where atoken_expires != '%s' && atoken_expires < %s", dbesc(NULL_DATE), - dbutcnow() + db_utcnow() ); diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php index 036a4991b..21c46cec5 100644 --- a/Zotlabs/Daemon/Onepoll.php +++ b/Zotlabs/Daemon/Onepoll.php @@ -102,7 +102,9 @@ class Onepoll { $fetch_feed = true; $x = null; - if(! ($contact['abook_their_perms'] & PERMS_R_STREAM )) + $can_view_stream = intval(get_abconfig($importer_uid,$contact['abook_xchan'],'their_perms','view_stream')); + + if(! $can_view_stream) $fetch_feed = false; if($fetch_feed) { |