Merge pull request wordpress-mobile#3890 from wordpress-mobile/issues/3889-fix-pages-predicate

Fixes the structure of the page lists fetch predicate.

Author: sendhil

WordPress/Classes/ViewRelated/Pages/PageListViewController.m

@@ -199,20 +199,23 @@ - (NSPredicate *)predicateForFetchRequest
     NSPredicate *basePredicate = [NSPredicate predicateWithFormat:@"blog = %@ && original = nil", self.blog];
     [predicates addObject:basePredicate];
 
+    NSString *searchText = [self currentSearchTerm];
     NSPredicate *filterPredicate = [self currentPostListFilter].predicateForFetchRequest;
+
+    // If we have recently trashed posts, create an OR predicate to find posts matching the filter,
+    // or posts that were recently deleted.
+    if ([searchText length] == 0 && [self.recentlyTrashedPostIDs count] > 0) {
+        NSPredicate *trashedPredicate = [NSPredicate predicateWithFormat:@"postID IN %@", self.recentlyTrashedPostIDs];
+        filterPredicate = [NSCompoundPredicate orPredicateWithSubpredicates:@[filterPredicate, trashedPredicate]];
+    }
     [predicates addObject:filterPredicate];
 
-    NSString *searchText = self.searchController.searchBar.text;
     if ([searchText length] > 0) {
         NSPredicate *searchPredicate = [NSPredicate predicateWithFormat:@"postTitle CONTAINS[cd] %@", searchText];
         [predicates addObject:searchPredicate];
     }
 
     NSPredicate *predicate = [NSCompoundPredicate andPredicateWithSubpredicates:predicates];
-    if ([searchText length] == 0 && [self.recentlyTrashedPostIDs count] > 0) {
-        NSPredicate *trashedPredicate = [NSPredicate predicateWithFormat:@"postID IN %@", self.recentlyTrashedPostIDs];
-        predicate = [NSCompoundPredicate orPredicateWithSubpredicates:@[predicate, trashedPredicate]];
-    }
 
     return predicate;
 }