Merge branch 'od/issue_496' into develop

amro · Aug 15, 2013 · 8684a39 · 8684a39
2 parents 809f9d6 + b0c0fc2
commit 8684a39
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/Core/Source/DTCompatibility.h b/Core/Source/DTCompatibility.h
@@ -29,6 +29,11 @@
 		#define DTCORETEXT_NEEDS_ATTRIBUTE_REPLACEMENT_LEAK_FIX 1
 	#endif
 
+	// iOS 7 bug (rdar://14684188) workaround, can be removed once this bug is fixed
+	#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_6_1
+		#define DTCORETEXT_FIX_14684188 1
+	#endif
+
 #endif
 
 

diff --git a/Core/Source/DTHTMLAttributedStringBuilder.m b/Core/Source/DTHTMLAttributedStringBuilder.m
@@ -280,6 +280,11 @@ - (BOOL)_buildString
 	_defaultTag.paragraphStyle = _defaultParagraphStyle;
 	_defaultTag.textScale = _textScale;
 
+#if DTCORETEXT_FIX_14684188
+	// workaround, only necessary while rdar://14684188 is not fixed
+	_defaultTag.textColor = [UIColor blackColor];
+#endif
+
 	id defaultColor = [_options objectForKey:DTDefaultTextColor];
 	if (defaultColor)
 	{