From cf557f2101678248073344ebe830de452aa5ec16 Mon Sep 17 00:00:00 2001
From: "Namhyeon, Go" <gnh1201@gmail.com>
Date: Tue, 29 May 2018 17:30:01 +0900
Subject: [PATCH] Update base.php

---
 system/base.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/system/base.php b/system/base.php
index cca7d57..94fe99c 100644
--- a/system/base.php
+++ b/system/base.php
@@ -226,9 +226,8 @@ if(!function_exists("check_function_exists")) {
 
 if(!function_exists("get_property_value")) {
 	function get_property_value($prop, $obj, $ac=false) {
-		$result = null;
-
-		if(property_exists($obj, $prop)) {
+		$result = false;
+		if(is_object($obj) && property_exists($obj, $prop)) {
 			if($ac) {
 				$reflection = new ReflectionClass($obj);
 				$property = $reflection->getProperty($prop);
@@ -238,11 +237,11 @@ if(!function_exists("get_property_value")) {
 				$result = $obj->{$prop};
 			}
 		}
-
 		return $result;
 	}
 }
 
+
 $scope = array();
 
 set_scope("loaded", array(