aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-02-08 15:14:45 -0800
committerfriendica <info@friendica.com>2015-02-08 15:14:45 -0800
commit7893b649552f23125835cd759ba00230b02a0ab3 (patch)
tree5592905b62f24f92ce77b6786cc3d3d3d95c80fa
parent11dfeb652b2e07e0e4eb27643e4c8ece7e6f9942 (diff)
downloadvolse-hubzilla-7893b649552f23125835cd759ba00230b02a0ab3.tar.gz
volse-hubzilla-7893b649552f23125835cd759ba00230b02a0ab3.tar.bz2
volse-hubzilla-7893b649552f23125835cd759ba00230b02a0ab3.zip
make default calendar view ambivalent to the state of the ignore flag.
-rwxr-xr-xmod/events.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/mod/events.php b/mod/events.php
index 233447cb1..a34aa62ab 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -242,7 +242,7 @@ function events_content(&$a) {
$mode = 'view';
$y = 0;
$m = 0;
- $ignored = ((x($_REQUEST,'ignored')) ? intval($_REQUEST['ignored']) : 0);
+ $ignored = ((x($_REQUEST,'ignored')) ? " and ignored = " . intval($_REQUEST['ignored']) . " " : '');
if(argc() > 1) {
if(argc() > 2 && argv(1) == 'event') {
@@ -338,11 +338,10 @@ function events_content(&$a) {
$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
from event left join item on event_hash = resource_id
- where resource_type = 'event' and event.uid = %d and event.ignore = %d
+ where resource_type = 'event' and event.uid = %d $ignored
AND (( `adjust` = 0 AND ( `finish` >= '%s' or nofinish = 1 ) AND `start` <= '%s' )
OR ( `adjust` = 1 AND ( `finish` >= '%s' or nofinish = 1 ) AND `start` <= '%s' )) ",
intval(local_channel()),
- intval($ignored),
dbesc($start),
dbesc($finish),
dbesc($adjust_start),