diff --git a/inc/caldav-REPORT-calquery.php b/inc/caldav-REPORT-calquery.php index b8bdf82b..61d63c56 100644 --- a/inc/caldav-REPORT-calquery.php +++ b/inc/caldav-REPORT-calquery.php @@ -26,10 +26,10 @@ function check_for_expansion( $calendar_data_node ) { */ $qry_content = $xmltree->GetContent('urn:ietf:params:xml:ns:caldav:calendar-query'); +$properties = array(); while (list($idx, $qqq) = each($qry_content)) { $proptype = $qry_content[$idx]->GetTag(); - $properties = array(); switch( $proptype ) { case 'DAV::prop': $qry_props = $xmltree->GetPath('/urn:ietf:params:xml:ns:caldav:calendar-query/'.$proptype.'/*'); diff --git a/inc/ui/collection-edit.php b/inc/ui/collection-edit.php index b1e6dfd3..14e47b82 100644 --- a/inc/ui/collection-edit.php +++ b/inc/ui/collection-edit.php @@ -317,7 +317,9 @@ label.privilege { $prompt_collection_id: $value_id $prompt_dav_name: $value_dav_name $prompt_entries: $entries - $prompt_load_file: ##ics_file.file.60## + $prompt_load_file: ##ics_file.file.60## +   + $prompt_displayname: ##dav_displayname.input.50## $prompt_public: ##publicly_readable.checkbox## $prompt_calendar: ##is_calendar.checkbox## @@ -352,6 +354,7 @@ toggle_visible('fld_use_default_privs','!privileges_settings'); EOTEMPLATE; + $editor->SetTemplate( $template ); $page_elements[] = $editor;