Merge branch 'main' into twn

wikimedia · May 23, 2022 · a1fedf7 · a1fedf7
2 parents 9e871ba + 372478c
commit a1fedf7
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Wikipedia/Code/WMFAppViewController.m b/Wikipedia/Code/WMFAppViewController.m
@@ -1895,6 +1895,12 @@ - (nullable UINavigationController *)currentNavigationController {
     while (presented.presentedViewController != nil) {
         presented = presented.presentedViewController;
     }
+
+    // This next block fixes a weird bug: https://phabricator.wikimedia.org/T305112#7936784
+    if ([NSStringFromClass([presented class]) isEqualToString: @"DDParsecCollectionViewController"] && presented.presentingViewController != nil) {
+        presented = presented.presentingViewController;
+    }
+
     if ([presented isKindOfClass:[UINavigationController class]]) {
         return (UINavigationController *)presented;
     } else {