From aa625fcfc55a4fd4de8eded94d92861b407aa444 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Wed, 9 Sep 2015 22:03:28 +0200
Subject: [PATCH] Fix filtering by pagestate when also filtering by page type

---
 classes/controller.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/classes/controller.php b/classes/controller.php
index 31d42d8a..f3f21f74 100644
--- a/classes/controller.php
+++ b/classes/controller.php
@@ -430,9 +430,10 @@ class AdminController
                 if (in_array('routable', $flags))
                     $collection = $collection->routable();
             }
-
             foreach ($pageStates as $pageState) {
-                unset($flags[$pageState]);
+                if (($pageState = array_search($pageState, $flags)) !== false) {
+                    unset($flags[$pageState]);
+                }
             }
 
             // Filter by page type