Merge commit '5f3baa519b387086429b2ff60bfa64f7d574230e' into my_master

This commit is contained in:
Aparajita Fishman committed 2010-08-02 12:43:33 -04:00
commit c2b73a0146
1 file changed
+6 -1
+6 -1
View File
@@ -54,7 +54,12 @@
[self setPlaceholderString:[cell placeholderString]];
[self setTextColor:[cell textColor]];
var textColor = [cell textColor],
defaultColor = [self currentValueForThemeAttribute:@"text-color"];
// Don't change the text color if it is not the default, that messes up the theme lookups later
if (![textColor isEqual:defaultColor])
[self setTextColor:[cell textColor]];
var frame = [self frame];