← Back to branch summary

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

« back to all changes in this revision

Viewing changes to calendar/base/modules/calProviderUtils.jsm

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-06-20 23:50:32 UTC
  • mfrom: (1.3.2)
  • Revision ID: package-import@ubuntu.com-20120620235032-fx5tuhrswvsju9z3
Tags: 1.6~b1+build1-0ubuntu1
New upstream release from the beta channel (CALENDAR_1_6b1_BUILD1)

Show diffs side-by-side

added added

removed removed

Lines of Context:
calendar/base/modules/calProviderUtils.jsm
854
854
            let id = this.getProperty("organizerId");
855
855
            if (id) {
856
856
                let org = aItem.organizer;
857
 
                if (!org || (org.id.toLowerCase() == id.toLowerCase())) {
 
857
                if (!org || !org.id || (org.id.toLowerCase() == id.toLowerCase())) {
858
858
                    return false;
859
859
                }
860
860
                return (aItem.getAttendeeById(id) != null);
863
863
        }
864
864
 
865
865
        let org = aItem.organizer;
866
 
        if (!org) {
 
866
        if (!org || !org.id) {
867
867
            // HACK
868
868
            // if we don't have an organizer, this is perhaps because it's an exception
869
869
            // to a recurring event. We check the parent item.
870
870
            if (aItem.parentItem) {
871
871
                org = aItem.parentItem.organizer;
872
 
                if (!org) return false;
 
872
                if (!org || !org.id) return false;
873
873
            } else {
874
874
                return false;
875
875
            }