Merge branch 'refs/heads/3.4/development'

MIT-Mobile · Mar 11, 2014 · 565ea13 · 565ea13
2 parents fd48ec5 + 7dc164d
commit 565ea13
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/Modules/People/PeopleDetailsTableViewCell.m b/Modules/People/PeopleDetailsTableViewCell.m
@@ -3,6 +3,17 @@
 
 @implementation PeopleDetailsTableViewCell
 
+- (id) initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self) {
+        self.detailTextLabel.lineBreakMode = UILineBreakModeWordWrap;
+        self.detailTextLabel.numberOfLines = 0;
+        return self;
+    }
+    return nil;
+}
+
 // this adjusts the height of the cell to fit contents
 - (void) layoutSubviews {
 	[super layoutSubviews];
@@ -17,9 +28,6 @@ - (void) layoutSubviews {
 											self.detailTextLabel.frame.origin.y,
 											self.detailTextLabel.frame.size.width, 
 											labelSize.height);
-
-	self.detailTextLabel.lineBreakMode = UILineBreakModeWordWrap;
-	self.detailTextLabel.numberOfLines = 0;
 }
 
 #pragma mark -

diff --git a/Resources/global/navbar_mit_logo.png b/Resources/global/navbar_mit_logo.png
diff --git a/Resources/global/navbar_mit_logo@2x.png b/Resources/global/navbar_mit_logo@2x.png