adium 5536:b3f0ce37cbea: Some strings think they're dates; add b...

commits at adium.im commits at adium.im
Wed Jun 5 20:58:24 UTC 2013


details:	http://hg.adium.im/adium/rev/b3f0ce37cbea
revision:	5536:b3f0ce37cbea
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Wed Jun 05 16:57:58 2013 -0400

Some strings think they're dates; add back the type check.

diffs (23 lines):

diff -r 94eac2b970cf -r b3f0ce37cbea Plugins/Status Menu Item/CBStatusMenuItemController.m
--- a/Plugins/Status Menu Item/CBStatusMenuItemController.m	Mon Jun 03 20:23:21 2013 -0400
+++ b/Plugins/Status Menu Item/CBStatusMenuItemController.m	Wed Jun 05 16:57:58 2013 -0400
@@ -163,7 +163,6 @@
 {
 	// Invalidate and release our timers
 	[self invalidateTimers];
-	
 	//Unregister ourself
 	[[AIContactObserverManager sharedManager] unregisterListObjectObserver:self];
 	[adium.chatController unregisterChatObserver:self];
diff -r 94eac2b970cf -r b3f0ce37cbea Source/AILogDateFormatter.m
--- a/Source/AILogDateFormatter.m	Mon Jun 03 20:23:21 2013 -0400
+++ b/Source/AILogDateFormatter.m	Wed Jun 05 16:57:58 2013 -0400
@@ -23,7 +23,7 @@
 {
 	NSString *returnValue = nil;
 
-	if ([self respondsToSelector:@selector(timeStyle)]) {
+	if ([self respondsToSelector:@selector(timeStyle)] && [date isKindOfClass:[NSDate class]]) {
 		NSDateFormatterStyle timeStyle = [self timeStyle];
 		
 		NSDate *dateToday = [NSDate date];




More information about the commits mailing list