From cee1d5dc4d858e861e5a8cdfeb0c7b802205bb91 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Mon, 28 Oct 2019 21:12:09 -0500
Subject: [PATCH] Rollback change that caused the search to not appear.  Issue
 #1199

---
 .../MasterTimelineViewController.swift        | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/iOS/MasterTimeline/MasterTimelineViewController.swift b/iOS/MasterTimeline/MasterTimelineViewController.swift
index b9c1c906f..a77f41f90 100644
--- a/iOS/MasterTimeline/MasterTimelineViewController.swift
+++ b/iOS/MasterTimeline/MasterTimelineViewController.swift
@@ -47,6 +47,19 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 		NotificationCenter.default.addObserver(self, selector: #selector(contentSizeCategoryDidChange), name: UIContentSizeCategory.didChangeNotification, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(displayNameDidChange), name: .DisplayNameDidChange, object: nil)
 
+		// Setup the Search Controller
+		searchController.delegate = self
+		searchController.searchResultsUpdater = self
+		searchController.obscuresBackgroundDuringPresentation = false
+		searchController.searchBar.delegate = self
+		searchController.searchBar.placeholder = NSLocalizedString("Search Articles", comment: "Search Articles")
+		searchController.searchBar.scopeButtonTitles = [
+			NSLocalizedString("Here", comment: "Here"),
+			NSLocalizedString("All Articles", comment: "All Articles")
+		]
+		navigationItem.searchController = searchController
+		definesPresentationContext = true
+
 		// Configure the table
 		tableView.dataSource = dataSource
 		numberOfTextLines = AppDefaults.timelineNumberOfLines
@@ -61,21 +74,6 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 		super.viewWillAppear(animated)
 	}
 	
-	override func viewWillLayoutSubviews() {
-		// If you setup the Search Controller in viewWillLayoutSubviews it won't show by default on creation
-		searchController.delegate = self
-		searchController.searchResultsUpdater = self
-		searchController.obscuresBackgroundDuringPresentation = false
-		searchController.searchBar.delegate = self
-		searchController.searchBar.placeholder = NSLocalizedString("Search Articles", comment: "Search Articles")
-		searchController.searchBar.scopeButtonTitles = [
-			NSLocalizedString("Here", comment: "Here"),
-			NSLocalizedString("All Articles", comment: "All Articles")
-		]
-		navigationItem.searchController = searchController
-		definesPresentationContext = true
-	}
-	
 	// MARK: Actions
 
 	@IBAction func markAllAsRead(_ sender: Any) {