From 4ecc13af83718e26e02afc9b8516a506ca5a26e1 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sat, 23 May 2015 20:13:23 -0400
Subject: [PATCH] [ticket/13733] Properly handle nonexistent classes as well

PHPBB3-13733
---
 phpBB/phpbb/extension/base.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/phpBB/phpbb/extension/base.php b/phpBB/phpbb/extension/base.php
index 8b4d747eaf..8e717e1beb 100644
--- a/phpBB/phpbb/extension/base.php
+++ b/phpBB/phpbb/extension/base.php
@@ -139,11 +139,21 @@ class base implements \phpbb\extension\extension_interface
 
 		foreach ($migrations as $key => $migration)
 		{
-			// If the class doesn't exist OR the class does not extend the migration class
-			// we need to skip it.
-			if (!class_exists($migration) || ($reflector = new \ReflectionClass($migration) && !$reflector->isSubclassOf('\phpbb\db\migration\migration'))) {
-				unset($migrations[$key]);
+			// If the class exists and is a subclass of the
+			// \phpbb\db\migration\migration abstract class
+			// we skip it.
+
+			// Otherwise, i.e. if it doesn't exist or it is
+			// not an extend the abstract class, we unset it
+			if (class_exists($migration)) {
+				$reflector = new \ReflectionClass($migration);
+				if ($reflector->isSubclassOf('\phpbb\db\migration\migration')) {
+					continue;
+				}
+
 			}
+
+			unset($migrations[$key]);
 		}
 
 		return $migrations;