merging 1.2 and trunk

This commit is contained in:
Lars Kneschke 2006-07-20 09:38:53 +00:00
parent 1f5898ce97
commit b07127ad4a

View File

@ -1071,18 +1071,15 @@
return false;
}
function search($_vcalData)
{
if(!$event = $this->icaltoegw($_vcalData))
{
function search($_vcalData) {
if(!$event = $this->icaltoegw($_vcalData)) {
return false;
}
$query = array(
'cal_start='.$this->date2ts($event['start'],true), // true = Server-time
'cal_end='.$this->date2ts($event['end'],true),
);
foreach(array('title','location','priority','public','non_blocking') as $name)
{
foreach(array('title','location','priority','public','non_blocking') as $name) {
if (isset($event[$name])) $query['cal_'.$name] = $event[$name];
}