adium/adium

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

2013-06-05, Frank Dowsett
b3f0ce37cbea
Parents 94eac2b970cf
Children 003c1066675e9b24179144bd
Some strings think they're dates; add back the type check.
2 files changed, 1 insertions(+), 2 deletions(-)
  • +0 -1
    Plugins/Status Menu Item/CBStatusMenuItemController.m
  • +1 -1
    Source/AILogDateFormatter.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];
    --- 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];