diff options
| author | Mario <mario@mariovavti.com> | 2019-03-14 09:38:46 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-03-14 09:38:46 +0100 |
| commit | 8769fa0156c470b533bdf23a0df5beb20bc1a4bd (patch) | |
| tree | 38fe90a86f1aeb2f524157dbd0d1da354eea44c6 /Zotlabs | |
| parent | 6ed7f47b3f2eff415d8abc4766b9c7d08227219d (diff) | |
| parent | f4d733868739da9e8ad32e1544f6deabc26871cd (diff) | |
| download | volse-hubzilla-8769fa0156c470b533bdf23a0df5beb20bc1a4bd.tar.gz volse-hubzilla-8769fa0156c470b533bdf23a0df5beb20bc1a4bd.tar.bz2 volse-hubzilla-8769fa0156c470b533bdf23a0df5beb20bc1a4bd.zip | |
Merge branch 'dev' into 'dev'
two compatibility issues zot/zot6
See merge request hubzilla/core!1553
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Daemon/Cron_daily.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Poller.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Zotlabs/Daemon/Cron_daily.php b/Zotlabs/Daemon/Cron_daily.php index f0351fcdd..dbfcff439 100644 --- a/Zotlabs/Daemon/Cron_daily.php +++ b/Zotlabs/Daemon/Cron_daily.php @@ -85,6 +85,7 @@ class Cron_daily { Master::Summon(array('Cli_suggest')); remove_obsolete_hublocs(); + z6_discover(); call_hooks('cron_daily',datetime_convert()); diff --git a/Zotlabs/Daemon/Poller.php b/Zotlabs/Daemon/Poller.php index a8cf34ce2..84bf7e923 100644 --- a/Zotlabs/Daemon/Poller.php +++ b/Zotlabs/Daemon/Poller.php @@ -199,6 +199,7 @@ class Poller { set_config('system','lastpoll',datetime_convert()); //All done - clear the lockfile + @unlink($lockfile); return; |