From bcb0764b1901f8ea9ee799a80594ae554e80e827 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri, 31 Jan 2014 15:04:49 -0500
Subject: [PATCH] Fix for bug #2505

---
 SOPE/NGCards/NGCardsSaxHandler.m | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/SOPE/NGCards/NGCardsSaxHandler.m b/SOPE/NGCards/NGCardsSaxHandler.m
index f8cddc53e..5ae033d41 100644
--- a/SOPE/NGCards/NGCardsSaxHandler.m
+++ b/SOPE/NGCards/NGCardsSaxHandler.m
@@ -35,6 +35,8 @@
      @"http://www.ietf.org/internet-drafts/draft-dawson-vcard-xml-dtd-03.txt"
 #endif
 
+static NSArray *privilegedTagNames = nil;
+
 @implementation NGCardsSaxHandler
 
 - (id) init
@@ -42,6 +44,12 @@
   if ((self = [super init]))
     topGroupClass = nil;
 
+  if (!privilegedTagNames)
+    {
+      privilegedTagNames = [NSArray arrayWithObjects: @"ADR", @"N", @"RRULE", nil];
+      RETAIN(privilegedTagNames);
+    }
+
   return self;
 }
 
@@ -211,7 +219,11 @@
       free (content);
       content = NULL;
 //       NSLog (@"content: '%@'", s);
-      contentValues = [s vCardSubvalues];
+      if ([privilegedTagNames containsObject: [currentElement tag]])
+        contentValues = [s vCardSubvalues];
+      else
+        contentValues = [NSMutableDictionary dictionaryWithObject: [NSMutableArray arrayWithObject: [NSMutableArray arrayWithObject: s]]
+                                                           forKey: @""];
     }
   else
     contentValues = nil;