← Back to branch summary

~ubuntu-branches/ubuntu/quantal/lightning-extension/quantal

« back to all changes in this revision

Viewing changes to calendar/providers/storage/calStorageCalendar.js

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-06-20 23:50:32 UTC
  • mto: This revision was merged to the branch mainline in revision 27.
  • Revision ID: package-import@ubuntu.com-20120620235032-haecscdskaopvm10
Tags: upstream-1.6~b1+build1
Import upstream version 1.6~b1+build1

Show diffs side-by-side

added added

removed removed

Lines of Context:
calendar/providers/storage/calStorageCalendar.js
1669
1669
                selectItem.params.item_id = item.id;
1670
1670
                while (selectItem.step()) {
1671
1671
                    var attendee = this.getAttendeeFromRow(selectItem.row);
1672
 
                    if (attendee.isOrganizer) {
1673
 
                        item.organizer = attendee;
 
1672
                    if (attendee && attendee.id) {
 
1673
                        if (attendee.isOrganizer) {
 
1674
                            item.organizer = attendee;
 
1675
                        } else {
 
1676
                            item.addAttendee(attendee);
 
1677
                        }
1674
1678
                    } else {
1675
 
                        item.addAttendee(attendee);
 
1679
                        cal.WARN("[calStorageCalendar] Skipping invalid attendee for item '" +
 
1680
                                 item.title + "' (" + item.id + ").");
1676
1681
                    }
1677
1682
                }
1678
1683
            } catch (e) {