Merge remote-tracking branch 'origin/hotfix-3.7.1'

wordpress-mobile · Aug 28, 2013 · 0896557 · 0896557
2 parents 5553896 + fff0475
commit 0896557
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 14 deletions.
diff --git a/WordPress/Classes/Blog.m b/WordPress/Classes/Blog.m
@@ -335,11 +335,11 @@ - (void)setReachable:(BOOL)reachable {
 }
 
 - (NSString *)username {
-    return self.account.username;
+    return self.account.username ?: @"";
 }
 
 - (NSString *)password {
-    return self.account.password;
+    return self.account.password ?: @"";
 }
 
 #pragma mark -

diff --git a/WordPress/Classes/BlogToAccount.m b/WordPress/Classes/BlogToAccount.m
@@ -97,7 +97,7 @@ - (BOOL)createDestinationInstancesForSourceInstance:(NSManagedObject *)source
         [userInfo setValue:accountLookup forKey:@"accounts"];
     }
     NSString *lookupKey = [NSString stringWithFormat:@"%@@%@", username, xmlrpc];
-    NSManagedObject *dest = [accountLookup valueForKey:lookupKey];
+    NSManagedObject *dest = [accountLookup objectForKey:lookupKey];
     if (!dest) {
         dest = [NSEntityDescription insertNewObjectForEntityForName:@"Account" inManagedObjectContext:destMOC];
         [dest setValue:xmlrpc forKey:@"xmlrpc"];

diff --git a/WordPress/Classes/ReaderReblogFormView.m b/WordPress/Classes/ReaderReblogFormView.m
@@ -114,12 +114,15 @@ - (id)initWithFrame:(CGRect)frame {
 			self.activityView.frame = frame;
 
 			NSNumber *primaryBlogId = [[NSUserDefaults standardUserDefaults] objectForKey:@"wpcom_users_prefered_blog_id"];
-			[blogs enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-				if ([[obj numberForKey:@"blogid"] isEqualToNumber:primaryBlogId]) {
-					[self setDestinationBlog:obj];
-					stop = YES;
-				}
-			}];
+
+            if (primaryBlogId != nil) {
+                [blogs enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+                    if ([[obj numberForKey:@"blogid"] isEqualToNumber:primaryBlogId]) {
+                        [self setDestinationBlog:obj];
+                        stop = YES;
+                    }
+                }];
+            }
 		} else if ([blogs count]) {
 			[self setDestinationBlog:[blogs objectAtIndex:0]];
 		}

diff --git a/WordPress/Classes/WPMobileStats.m b/WordPress/Classes/WPMobileStats.m
@@ -274,7 +274,7 @@ + (void)initializeStats
     }
 
     NSString *userId = [[NSUserDefaults standardUserDefaults] objectForKey:@"wpcom_user_id"];
-    [[QuantcastMeasurement sharedInstance] beginMeasurementSessionWithAPIKey:[WordPressComApiCredentials quantcastAPIKey] userIdentifier:userId labels:nil];
+    [[QuantcastMeasurement sharedInstance] beginMeasurementSessionWithAPIKey:[WordPressComApiCredentials quantcastAPIKey] userIdentifier:[userId md5] labels:nil];
 }
 
 + (void)updateUserIDForStats:(NSString *)userID

diff --git a/WordPress/Info-beta.plist b/WordPress/Info-beta.plist
@@ -30,7 +30,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.7</string>
+	<string>3.7.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>

diff --git a/WordPress/Info-dev.plist b/WordPress/Info-dev.plist
@@ -42,7 +42,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>3.7</string>
+	<string>3.7.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>

diff --git a/WordPress/Info.plist b/WordPress/Info.plist
@@ -29,7 +29,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.7</string>
+	<string>3.7.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -50,7 +50,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>3.7</string>
+	<string>3.7.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>