fix DRange() for ISO-8601 dates +/- X days

git-svn-id: svn://pmwiki.org/pmwiki/trunk@3002 524c5546-5005-0410-9a3e-e25e191bd360

1 files changed, 2 insertions, 1 deletions

diff --git a/pmwiki.php b/pmwiki.php
index 1e64d38e..542b10ea 100644
--- a/pmwiki.php
+++ b/pmwiki.php
@@ -516,7 +516,8 @@ function DRange($when) {
     )?                       # optional -ddThh:mm:ss
     (?!\d)                   # non-digit
     /x';
-  if (preg_match($dpat, $when, $m) && !preg_match('/[+-]\\s*\\d+\\s*(day|week|month|year)s?/i', $when)) {
+  if (preg_match($dpat, $when, $m) &&
+    !preg_match('/[+-]\\s*\\d+\\s*(sec(ond)?|min(ute)?|forth?night|day|week(day)?|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]++; }