#657384 by smoothify: Under rare circumstances, date default argument could get wrong...

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f53df36..7324d24 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -37,6 +37,7 @@ Views 2.x-dev
     o #651274 by dagmar: Show relationship labels in field lists for style config forms.
     o #531686 by jweowu: Update process failed to properly track its history, causing errors when updating from really old sites.
     o #638004 by stBorchert and BillyMG: If a field "Output as link" ends up with an empty path, do not actually print an empty link.
+    o #657384 by smoothify: Under rare circumstances, date default argument could get wrong value.
   
   Other changes:
     o #570558 by yhahn: Segment default views caching to conserve memory used by Views during normal operation.

diff --git a/handlers/views_handler_argument_date.inc b/handlers/views_handler_argument_date.inc
index f8e4739..3925c9a 100644 (file)
--- a/handlers/views_handler_argument_date.inc
+++ b/handlers/views_handler_argument_date.inc
@@ -38,7 +38,7 @@ class views_handler_argument_date extends views_handler_argument_formula {
     if (!$raw && $this->options['default_argument_type'] == 'date') {
       return date($this->arg_format, time());
     }
-    else if (!$raw) {
+    else if (!$raw && in_array($this->options['default_argument_type'], array('node_created', 'node_changed'))) {
       foreach (range(1, 3) as $i) {
         $node = menu_get_object('node', $i);
         if (!empty($node)) {