From 062457415cd485f8521852177d87b489f6858495 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Thu, 27 Feb 2014 10:13:09 +0900
Subject: [PATCH] =?UTF-8?q?fix=20#480=20class=5Fexists()=EC=9D=98=20autolo?=
 =?UTF-8?q?ad=20=EB=B9=84=ED=99=9C=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/captcha/captcha.addon.php               | 2 +-
 addons/captcha_member/captcha_member.addon.php | 2 +-
 classes/module/ModuleHandler.class.php         | 4 ++--
 classes/validator/Validator.class.php          | 4 ++--
 modules/widget/widget.controller.php           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/captcha/captcha.addon.php b/addons/captcha/captcha.addon.php
index 433adf527..a03a9d847 100644
--- a/addons/captcha/captcha.addon.php
+++ b/addons/captcha/captcha.addon.php
@@ -9,7 +9,7 @@ if(!defined("__XE__")) exit();
  * @brief Captcha for a particular action
  * English alphabets and voice verification added
  * */
-if(!class_exists('AddonCaptcha'))
+if(!class_exists('AddonCaptcha', false))
 {
 	// On the mobile mode, XE Core does not load jquery and xe.js as normal.
 	Context::loadFile(array('./common/js/jquery.min.js', 'head', NULL, -100000), true);
diff --git a/addons/captcha_member/captcha_member.addon.php b/addons/captcha_member/captcha_member.addon.php
index ac1e57c5f..211fd8687 100644
--- a/addons/captcha_member/captcha_member.addon.php
+++ b/addons/captcha_member/captcha_member.addon.php
@@ -9,7 +9,7 @@ if(!defined("__XE__")) exit();
  * @brief Captcha for a particular action
  * English alphabets and voice verification added
  * */
-if(!class_exists('AddonMemberCaptcha'))
+if(!class_exists('AddonMemberCaptcha', false))
 {
 	// On the mobile mode, XE Core does not load jquery and xe.js as normal.
 	Context::loadFile(array('./common/js/jquery.min.js', 'head', NULL, -100000), true);
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 6bfc5e556..569997d25 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -1025,7 +1025,7 @@ class ModuleHandler extends Handler
 			}
 
 			// Get base class name and load the file contains it
-			if(!class_exists($module))
+			if(!class_exists($module, false))
 			{
 				$high_class_file = sprintf('%s%s%s.class.php', _XE_PATH_, $class_path, $module);
 				if(!file_exists($high_class_file))
@@ -1043,7 +1043,7 @@ class ModuleHandler extends Handler
 
 			// Create an instance with eval function
 			require_once($class_file);
-			if(!class_exists($instance_name))
+			if(!class_exists($instance_name, false))
 			{
 				return NULL;
 			}
diff --git a/classes/validator/Validator.class.php b/classes/validator/Validator.class.php
index 11762da50..8ad9d4f13 100644
--- a/classes/validator/Validator.class.php
+++ b/classes/validator/Validator.class.php
@@ -667,7 +667,7 @@ class Validator
 		}
 
 		// current language
-		$lang_type = class_exists('Context') ? Context::getLangType() : 'en';
+		$lang_type = class_exists('Context', false) ? Context::getLangType() : 'en';
 
 		// check the file
 		$filepath = $dir . '/' . md5($this->_version . ' ' . $this->_xml_path) . ".{$lang_type}.js";
@@ -706,7 +706,7 @@ class Validator
 		list($ruleset) = explode('.', $ruleset);
 
 		// current language
-		$lang_type = class_exists('Context') ? Context::getLangType() : 'en';
+		$lang_type = class_exists('Context', false) ? Context::getLangType() : 'en';
 
 		// custom rulesets
 		$addrules = array();
diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php
index 2fd0fdeeb..f807593cc 100644
--- a/modules/widget/widget.controller.php
+++ b/modules/widget/widget.controller.php
@@ -641,7 +641,7 @@ class widgetController extends widget
 			require_once($class_file);
 
 			// Creating Objects
-			if(!class_exists($widget))
+			if(!class_exists($widget, false))
 			{
 				return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
 			}