diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2011-10-25 19:59:23 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2011-10-25 19:59:23 +0200 |
| commit | 55d957489d3680ca97d70faa70ea15999a7278df (patch) | |
| tree | 622f06f004be54b9a7f3778e12c145485e919ea9 /apps/calendar/lib | |
| parent | 50649ad0d19e8dc8ad3f2366673217c752d1774c (diff) | |
| download | nextcloud-server-55d957489d3680ca97d70faa70ea15999a7278df.tar.gz nextcloud-server-55d957489d3680ca97d70faa70ea15999a7278df.zip | |
Fix fromtime/totime warnings
Diffstat (limited to 'apps/calendar/lib')
| -rw-r--r-- | apps/calendar/lib/object.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php index 4afeb341a9c..9a343a23764 100644 --- a/apps/calendar/lib/object.php +++ b/apps/calendar/lib/object.php @@ -426,7 +426,7 @@ class OC_Calendar_Object{ $errarr['endbeforestart'] = 'true'; $errnum++; } - if($fromday == $today && $frommonth == $tomonth && $fromyear == $toyear){ + if(!$allday && $fromday == $today && $frommonth == $tomonth && $fromyear == $toyear){ list($tohours, $tominutes) = explode(':', $request['totime']); list($fromhours, $fromminutes) = explode(':', $request['fromtime']); if($tohours < $fromhours){ @@ -481,9 +481,11 @@ class OC_Calendar_Object{ $categories = isset($request["categories"]) ? $request["categories"] : null; $allday = isset($request["allday"]); $from = $request["from"]; - $fromtime = $request["fromtime"]; $to = $request["to"]; - $totime = $request["totime"]; + if (!$allday){ + $fromtime = $request['fromtime']; + $totime = $request['totime']; + } $description = $request["description"]; //$repeat = $request["repeat"]; /*switch($request["repeatfreq"]){ |