aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-12-21 18:40:25 -0800
committerfriendica <info@friendica.com>2014-12-21 18:40:25 -0800
commitd3830aea9661dac0610eef72cad35b188832b7f2 (patch)
tree6609f577ec12b47eb53e5169a2e97f1039dbea31 /include
parentb840c279957667168b400207caff14dc78043994 (diff)
downloadvolse-hubzilla-d3830aea9661dac0610eef72cad35b188832b7f2.tar.gz
volse-hubzilla-d3830aea9661dac0610eef72cad35b188832b7f2.tar.bz2
volse-hubzilla-d3830aea9661dac0610eef72cad35b188832b7f2.zip
provide last successful poll run time (using relative time) in siteinfo so that we can tell folks that have no idea what we're talking about that their poller definitely isn't running and this is probably why nothing works correctly.
Diffstat (limited to 'include')
-rw-r--r--include/bbcode.php5
-rw-r--r--include/poller.php2
2 files changed, 2 insertions, 5 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 1037db045..9445eb007 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -368,11 +368,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_spacefy',$Text);
}
-// Not yet implemented - thinking this should display a map or perhaps be a map directive
-// if (strpos($Text,'[location]') !== false) {
-// $Text = preg_replace_callback("/\[location\](.*?)\[\/location\]/ism", 'bb_location',$Text);
-// }
-
// If we find any event code, turn it into an event.
diff --git a/include/poller.php b/include/poller.php
index e13c6829d..bd3f81a2e 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -403,6 +403,8 @@ function poller_run($argv, $argc){
}
}
+ set_config('system','lastpoll',datetime_convert());
+
//All done - clear the lockfile
@unlink($lockfile);