Merge remote-tracking branch 'origin/develop' into try/removing-forma…

…tterkit

# Conflicts:
#	Podfile.lock

Podfile

@@ -43,9 +43,9 @@ def wordpress_ui
 end
 
 def wordpress_kit
-    pod 'WordPressKit', '4.10.0'
+    pod 'WordPressKit', '4.11.0-beta.1'
     #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
-    #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'issue/14224-add-zendesk-plan-field'
+    #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'issue/14313_remove_post_content_sanitization'
     #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''
     #pod 'WordPressKit', :path => '../WordPressKit-iOS'
 end
@@ -169,7 +169,7 @@ target 'WordPress' do
     ##
     wordpress_kit
     wordpress_shared
-    
+
     # Production
     pod 'Automattic-Tracks-iOS', '~> 0.4.4'
     # While in PR
@@ -208,7 +208,7 @@ target 'WordPress' do
 
     post_install do
         project_root = File.dirname(__FILE__)
-      
+
         puts 'Patching RCTShadowView to fix nested group block - it could be removed after upgrade to 0.62'
         %x(patch "#{project_root}/Pods/React-Core/React/Views/RCTShadowView.m" < "#{project_root}/patches/react-native+0.61.5.patch")
         puts 'Patching RCTActionSheet to add possibility to disable action sheet buttons -
@@ -217,7 +217,7 @@ target 'WordPress' do
 
         ## Convert the 3rd-party license acknowledgements markdown into html for use in the app
         require 'commonmarker'
-        
+
         acknowledgements = 'Acknowledgments'
         markdown = File.read("#{project_root}/Pods/Target Support Files/Pods-WordPress/Pods-WordPress-acknowledgements.markdown")
         rendered_html = CommonMarker.render_html(markdown, :DEFAULT)

Podfile.lock

@@ -392,7 +392,7 @@ PODS:
     - WordPressKit (~> 4.0-beta.0)
     - WordPressShared (~> 1.0-beta.0)
     - WordPressUI (~> 1.7.0)
-  - WordPressKit (4.10.0):
+  - WordPressKit (4.11.0-beta.1):
     - Alamofire (~> 4.8.0)
     - CocoaLumberjack (~> 3.4)
     - NSObject-SafeExpectations (= 0.0.4)
@@ -483,7 +483,7 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.2)
   - WordPressAuthenticator (~> 1.18.0)
-  - WordPressKit (= 4.10.0)
+  - WordPressKit (= 4.11.0-beta.1)
   - WordPressMocks (~> 0.0.8)
   - WordPressShared (= 1.9.0)
   - WordPressUI (~> 1.7.1)
@@ -703,7 +703,7 @@ SPEC CHECKSUMS:
   WordPress-Aztec-iOS: d01bf0c5e150ae6a046f06ba63b7cc2762061c0b
   WordPress-Editor-iOS: 5b726489e5ae07b7281a2862d69aba2d5c83f140
   WordPressAuthenticator: 7c7f442088af2022f7ee5d7baa6bd73d87df9e25
-  WordPressKit: 5205224c1a7b878b74149ab9eef1b5e89b1b20f8
+  WordPressKit: cf04f034a376fe54a44edff62c3bd0ece5ef13a6
   WordPressMocks: b4064b99a073117bbc304abe82df78f2fbe60992
   WordPressShared: b887b17aa949e4b142a1421fd479de495db9a054
   WordPressUI: 9da5d966b8beb091950cd96880db398d7f30e246
@@ -719,6 +719,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: a87ab1e4badace92c75eb11dc77ede1e995b2adc
   ZIPFoundation: 249fa8890597086cd536bb2df5c9804d84e122b0
 
-PODFILE CHECKSUM: 2e276925bf677636db90f919b12af36cb8c32669
+PODFILE CHECKSUM: d2d6388e60136755cfcf98db3efee5eda1de389f
 
 COCOAPODS: 1.8.4

WordPress/Classes/Services/ReaderPostService.m

@@ -1153,7 +1153,6 @@ - (ReaderPost *)createOrReplaceFromRemotePost:(RemoteReaderPost *)remotePost for
     post.blogURL = remotePost.blogURL;
     post.commentCount = remotePost.commentCount;
     post.commentsOpen = remotePost.commentsOpen;
-    post.content = remotePost.content;
     post.date_created_gmt = [DateUtils dateFromISOString:remotePost.date_created_gmt];
     post.featuredImage = remotePost.featuredImage;
     post.feedID = remotePost.feedID;
@@ -1227,6 +1226,12 @@ - (ReaderPost *)createOrReplaceFromRemotePost:(RemoteReaderPost *)remotePost for
         post.sourceAttribution = nil;
     }
 
+    if ([Feature enabled:FeatureFlagReaderWebview]) {
+        post.content = remotePost.content;
+    } else {
+        post.content = [RichContentFormatter formatContentString:remotePost.content isPrivateSite:remotePost.isBlogPrivate];
+    }
+
     // assign the topic last.
     post.topic = topic;