diff options
| author | redmatrix <git@macgirvin.com> | 2016-06-03 18:39:11 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-06-03 18:39:11 -0700 |
| commit | 1877df0e703489d44119cddf05621570a71d5bd5 (patch) | |
| tree | e4a122be5da0f9142bbb95358cad7ec1ef1dc7aa | |
| parent | a7e5e3d5740e499fdf44874d9d361cf344dfd290 (diff) | |
| download | volse-hubzilla-1877df0e703489d44119cddf05621570a71d5bd5.tar.gz volse-hubzilla-1877df0e703489d44119cddf05621570a71d5bd5.tar.bz2 volse-hubzilla-1877df0e703489d44119cddf05621570a71d5bd5.zip | |
missed table rename in event query in mod_manage
| -rw-r--r-- | Zotlabs/Module/Manage.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Zotlabs/Module/Manage.php b/Zotlabs/Module/Manage.php index 5ae79dbb2..4ca044c4a 100644 --- a/Zotlabs/Module/Manage.php +++ b/Zotlabs/Module/Manage.php @@ -93,9 +93,9 @@ class Manage extends \Zotlabs\Web\Controller { $channels[$x]['mail'] = intval($mails[0]['total']); - $events = q("SELECT type, start, adjust FROM `event` - WHERE `event`.`uid` = %d AND start < '%s' AND start > '%s' and `ignore` = 0 - ORDER BY `start` ASC ", + $events = q("SELECT etype, dtstart, adjust FROM `event` + WHERE `event`.`uid` = %d AND dtstart < '%s' AND dtstart > '%s' and `dismissed` = 0 + ORDER BY `dtstart` ASC ", intval($channels[$x]['channel_id']), dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + 7 days')), dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days')) @@ -108,14 +108,14 @@ class Manage extends \Zotlabs\Web\Controller { $str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d'); foreach($events as $e) { $bd = false; - if($e['type'] === 'birthday') { + if($e['etype'] === 'birthday') { $channels[$x]['birthdays'] ++; $bd = true; } else { $channels[$x]['events'] ++; } - if(datetime_convert('UTC', ((intval($e['adjust'])) ? date_default_timezone_get() : 'UTC'), $e['start'], 'Y-m-d') === $str_now) { + if(datetime_convert('UTC', ((intval($e['adjust'])) ? date_default_timezone_get() : 'UTC'), $e['dtstart'], 'Y-m-d') === $str_now) { $channels[$x]['all_events_today'] ++; if($bd) $channels[$x]['birthdays_today'] ++; |