From 096a1926a9b614d0f0fc8af5ccb81a7723a3fb86 Mon Sep 17 00:00:00 2001
From: conory <conorycom@gmail.com>
Date: Fri, 13 May 2016 12:34:08 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B6=80=EB=AA=A8=20=EB=AA=A8=EB=93=88?=
 =?UTF-8?q?=EC=9D=B4=20=EB=B8=94=EB=9E=99=EB=A6=AC=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=EC=97=90=20=EC=98=AC=EB=9D=BC=EC=9E=88=EC=9D=84=EB=95=8C=20?=
 =?UTF-8?q?=ED=99=95=EC=9E=A5=EB=AA=A8=EB=93=88=EC=9D=98=20=ED=8A=B8?=
 =?UTF-8?q?=EB=A6=AC=EA=B1=B0=EB=8F=84=20=EC=8B=A4=ED=96=89=EB=90=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/module/ModuleHandler.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index b58e18bf1..92ca678d5 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -1261,19 +1261,19 @@ class ModuleHandler extends Handler
 			$type = $item->type;
 			$called_method = $item->called_method;
 
-			// do not call if module is blacklisted
-			if (Context::isBlacklistedPlugin($module))
-			{
-				continue;
-			}
-
 			// todo why don't we call a normal class object ?
 			$oModule = getModule($module, $type);
 			if(!$oModule || !method_exists($oModule, $called_method))
 			{
 				continue;
 			}
-
+			
+			// do not call if module is blacklisted
+			if (Context::isBlacklistedPlugin($oModule->module))
+			{
+				continue;
+			}
+			
 			$before_each_trigger_time = microtime(true);
 			$output = $oModule->{$called_method}($obj);
 			$after_each_trigger_time = microtime(true);