diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-05-27 12:31:51 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-05-27 12:31:51 +0200 |
| commit | b14f2d0388601879b69a0d43a576b068ae412ea8 (patch) | |
| tree | f008b683a928f9e09103e7d26045a7f48c253f17 /3rdparty | |
| parent | 143287738ad9415b910240563de71cc7dbd6f2da (diff) | |
| download | nextcloud-server-b14f2d0388601879b69a0d43a576b068ae412ea8.tar.gz nextcloud-server-b14f2d0388601879b69a0d43a576b068ae412ea8.zip | |
update When
Diffstat (limited to '3rdparty')
| -rw-r--r-- | 3rdparty/when/When.php | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/3rdparty/when/When.php b/3rdparty/when/When.php index d54f296ed61..5f97f0eb9bf 100644 --- a/3rdparty/when/When.php +++ b/3rdparty/when/When.php @@ -586,7 +586,7 @@ class When } } } - elseif($this->gobyday && $interval == "month") + elseif($this->gobyday || $interval == "month") { $_mdays = range(1, date('t',mktime(0,0,0,$month,1,$year))); foreach($_mdays as $_mday) @@ -621,13 +621,7 @@ class When if($interval == "month") { - - $this->try_date->modify('first day of next month'); - if((int) date('t', $this->try_date->format('U')) > (int) $this->start_date->format('j')){ - $this->try_date->modify('+' . (int) $this->start_date->format('j') - 1 . ' day'); - }else{ - $this->try_date->modify('+' . (int) date('t', $this->try_date->format('U')) - 1 . ' day'); - } + $this->try_date->modify('last day of ' . $this->interval . ' ' . $interval); } else { |