diff options
| author | zotlabs <mike@macgirvin.com> | 2016-11-05 03:31:50 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-11-05 03:31:50 -0700 |
| commit | 8811ca9e9efc8e177a49702066402fae819bdf5b (patch) | |
| tree | 815d3b4c21c430b89a6ef6249a8339663b991360 /Zotlabs | |
| parent | b541351a0a52d156085b0f1e06079c1c2e409eb8 (diff) | |
| download | volse-hubzilla-8811ca9e9efc8e177a49702066402fae819bdf5b.tar.gz volse-hubzilla-8811ca9e9efc8e177a49702066402fae819bdf5b.tar.bz2 volse-hubzilla-8811ca9e9efc8e177a49702066402fae819bdf5b.zip | |
provide /locs link on settings page if there is more than one hubloc for this channnel *that isn't deleted*.
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Locs.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Ping.php | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/Zotlabs/Module/Locs.php b/Zotlabs/Module/Locs.php index 4b1e3ffe2..47ece8041 100644 --- a/Zotlabs/Module/Locs.php +++ b/Zotlabs/Module/Locs.php @@ -80,7 +80,7 @@ class Locs extends \Zotlabs\Web\Controller { - function get() { + function get() { if(! local_channel()) { diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index c385201ce..bf2fa5cc9 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -324,10 +324,6 @@ class Ping extends \Zotlabs\Web\Controller { if($r) { foreach($r as $rr) { - if($rr['adjust']) - $md = datetime_convert('UTC', date_default_timezone_get(), $rr['dtstart'], 'Y/m'); - else - $md = datetime_convert('UTC', 'UTC', $rr['dtstart'], 'Y/m'); $strt = datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart']); $today = ((substr($strt, 0, 10) === datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d')) ? true : false); |