From 3269f3a3979401ad42e96e9010bfea2f64ab6edc Mon Sep 17 00:00:00 2001
From: petko <petko@524c5546-5005-0410-9a3e-e25e191bd360>
Date: Fri, 5 Sep 2014 13:00:11 +0000
Subject: fix DRange() for ISO-8601 dates +/- X days

git-svn-id: svn://pmwiki.org/pmwiki/trunk@3001 524c5546-5005-0410-9a3e-e25e191bd360
---
 pmwiki.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmwiki.php b/pmwiki.php
index 3509b459..1e64d38e 100644
--- a/pmwiki.php
+++ b/pmwiki.php
@@ -516,7 +516,7 @@ function DRange($when) {
     )?                       # optional -ddThh:mm:ss
     (?!\d)                   # non-digit
     /x';
-  if (preg_match($dpat, $when, $m)) {
+  if (preg_match($dpat, $when, $m) && !preg_match('/[+-]\\s*\\d+\\s*(day|week|month|year)s?/i', $when)) {
     $n = $m;
     ##  if no time given, assume range of 1 day (except when full month)
     if (@$m[4]>'' && @$m[5] == '') { @$n[4]++; }
-- 
cgit v1.2.3