summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Great Git Migration2011-01-03 12:47:47 (GMT)
committer The Great Git Migration2011-01-03 12:47:47 (GMT)
commit128f8d5c90c88fac8dc64863347c155e452a57c9 (patch)
tree4ee0c7848bcc1c0843a470eba21160e2e1539a64
parent519ee54968be6aeaa35edc29142f8daa32eb280d (diff)
This commit was manufactured as part of Drupal's Great Git Migration to6.x-2.7
create tag 'DRUPAL-6--2-7'. Sprout from DRUPAL-6--2 2011-01-01 00:52:57 UTC Karen Stevenson <karens@45874.no-reply.drupal.org> '#514242 Day repeated every two weeks was broken by wrong day comparison value.' Cherrypick from DRUPAL-6--2 2011-01-03 12:47:46 UTC Karen Stevenson <karens@45874.no-reply.drupal.org> 'Update CHANGELOG.txt in prep for new release.': CHANGELOG.txt includes/date_api_argument_handler.inc
-rw-r--r--CHANGELOG.txt2
-rw-r--r--includes/date_api_argument_handler.inc5
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f74f37d..7748f96 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,8 @@ Date Module 6.x
Version 6.2-dev
=================
+Version 6.2.7
+=============
- #514242 Day repeated every two weeks was broken by wrong day comparison value.
- Fix a bug in the calculation of the week days when using ISO weeks.
- #549042 The date_week() function should return an integer even when using ISO weeks.
diff --git a/includes/date_api_argument_handler.inc b/includes/date_api_argument_handler.inc
index 09b4123..7d2b4d1 100644
--- a/includes/date_api_argument_handler.inc
+++ b/includes/date_api_argument_handler.inc
@@ -340,8 +340,9 @@ class date_api_argument_handler extends views_handler_argument_date {
// See if we're outside the allowed date range for our argument.
if (date_format($min_date, 'Y') < $this->view->date_info->min_allowed_year || date_format($max_date, 'Y') > $this->view->date_info->max_allowed_year) {
- drupal_not_found();
- exit;
+ $this->forbid = TRUE;
+ $this->query->add_where('date', "0=1");
+ return;
}
// The second option seems to work better in the block view if