[MediaWiki-commits] [Gerrit] use correct site when loading search results - change (apps...wikipedia)

[Bgerstle (Code Review)]

Bgerstle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/226926

Change subject: use correct site when loading search results
......................................................................

use correct site when loading search results

Change-Id: Iddcc803914758623a23d25895635eee81c1a2bfe
---
M Wikipedia/View Controllers/SearchResults/SearchResultsController.m
1 file changed, 11 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/26/226926/1

diff --git a/Wikipedia/View Controllers/SearchResults/SearchResultsController.m 
b/Wikipedia/View Controllers/SearchResults/SearchResultsController.m
index d1d6d3c..b51ce2a 100644
--- a/Wikipedia/View Controllers/SearchResults/SearchResultsController.m
+++ b/Wikipedia/View Controllers/SearchResults/SearchResultsController.m
@@ -540,7 +540,7 @@
     return (self.type == WMFSearchResultsControllerTypeReadMore);
 }
 
-- (NSString*)getSearchLanguage {
+- (NSString*)searchLanguage {
     if ([self isReadMore]) {
         return [SessionSingleton sharedInstance].currentArticleSite.language;
     } else {
@@ -548,11 +548,15 @@
     }
 }
 
+- (MWKSite*)searchSite {
+    return [[MWKSite alloc] initWithLanguage:[self searchLanguage]];
+}
+
 - (void)performSupplementalFullTextSearchForTerm:(NSString*)searchTerm {
     (void)[[SearchResultFetcher alloc] initAndSearchForTerm:searchTerm
                                                  
searchType:SEARCH_TYPE_IN_ARTICLES
                                                
searchReason:SEARCH_REASON_SUPPLEMENT_PREFIX_WITH_FULL_TEXT
-                                                   language:[self 
getSearchLanguage]
+                                                   language:[self 
searchLanguage]
                                                  maxResults:[self 
maxResultsAdjustedForExcludedArticles]
                                                 withManager:[QueuesSingleton 
sharedInstance].searchResultsFetchManager
                                          thenNotifyDelegate:self];
@@ -569,7 +573,7 @@
     (void)[[SearchResultFetcher alloc] initAndSearchForTerm:searchTerm
                                                  searchType:SEARCH_TYPE_TITLES
                                                searchReason:reason
-                                                   language:[self 
getSearchLanguage]
+                                                   language:[self 
searchLanguage]
                                                  maxResults:[self 
maxResultsAdjustedForExcludedArticles]
                                                 withManager:[QueuesSingleton 
sharedInstance].searchResultsFetchManager
                                          thenNotifyDelegate:self];
@@ -646,17 +650,16 @@
     [self.searchFunnel logSearchResultTap];
 }
 
-- (void)loadArticleWithTitle:(NSString*)title {
-    if ([title length] == 0) {
+- (void)loadArticleWithTitle:(NSString*)titleText {
+    if ([titleText length] == 0) {
         return;
     }
 
     [self saveSearchTermToRecentList];
 
-    // Set CurrentArticleTitle so web view knows what to load.
-    title = [title wmf_stringByReplacingUndrescoresWithSpaces];
+    titleText = [titleText wmf_stringByReplacingUndrescoresWithSpaces];
 
-    [NAV loadArticleWithTitle:[[SessionSingleton sharedInstance].searchSite 
titleWithString:title]
+    [NAV loadArticleWithTitle:[[self searchSite] titleWithString:titleText]
                      animated:YES
               discoveryMethod:MWKHistoryDiscoveryMethodSearch
                    popToWebVC:YES];

-- 
To view, visit https://gerrit.wikimedia.org/r/226926
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddcc803914758623a23d25895635eee81c1a2bfe
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Bgerstle <bgers...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits