aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpetko <petko@524c5546-5005-0410-9a3e-e25e191bd360>2014-09-05 13:00:11 +0000
committerpetko <petko@524c5546-5005-0410-9a3e-e25e191bd360>2014-09-05 13:00:11 +0000
commit3269f3a3979401ad42e96e9010bfea2f64ab6edc (patch)
tree90197286e8d2f7dfb2f792c2c70f188be1711cd4
parent1e8d3da7a58aea85f3b81e038a7e8a748dd1816a (diff)
downloadpmwiki.svn-3269f3a3979401ad42e96e9010bfea2f64ab6edc.tar.bz2
fix DRange() for ISO-8601 dates +/- X days
git-svn-id: svn://pmwiki.org/pmwiki/trunk@3001 524c5546-5005-0410-9a3e-e25e191bd360
-rw-r--r--pmwiki.php2
1 files changed, 1 insertions, 1 deletions
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]++; }