From ae971306b7ddce417b13c2b3a27d9465568b2610 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Fri, 1 Dec 2017 01:10:48 +0900 Subject: [PATCH] Change instanceof Object to instanceof BaseObject --- modules/autoinstall/autoinstall.lib.php | 2 +- modules/comment/comment.model.php | 4 ++-- modules/document/document.model.php | 4 ++-- modules/editor/editor.controller.php | 2 +- modules/file/file.model.php | 2 +- modules/install/script/ko.install.php | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/autoinstall/autoinstall.lib.php b/modules/autoinstall/autoinstall.lib.php index 633895d60..3e1f6b7be 100644 --- a/modules/autoinstall/autoinstall.lib.php +++ b/modules/autoinstall/autoinstall.lib.php @@ -164,7 +164,7 @@ class ModuleInstaller } $output = $oModule->moduleUninstall(); - if($output instanceof Object && !$output->toBool()) + if($output instanceof BaseObject && !$output->toBool()) { return $output; } diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php index 861bf2e22..e80c943eb 100644 --- a/modules/comment/comment.model.php +++ b/modules/comment/comment.model.php @@ -514,7 +514,7 @@ class commentModel extends comment // call trigger (before) $trigger_output = ModuleHandler::triggerCall('comment.getCommentList', 'before', $args); - if($trigger_output instanceof Object && !$trigger_output->toBool()) + if($trigger_output instanceof BaseObject && !$trigger_output->toBool()) { return $output; } @@ -540,7 +540,7 @@ class commentModel extends comment // call trigger (after) $trigger_output = ModuleHandler::triggerCall('comment.getCommentList', 'after', $output); - if($trigger_output instanceof Object && !$trigger_output->toBool()) + if($trigger_output instanceof BaseObject && !$trigger_output->toBool()) { return $trigger_output; } diff --git a/modules/document/document.model.php b/modules/document/document.model.php index 81eaf2085..f6c3d0c11 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -228,13 +228,13 @@ class documentModel extends document // Call trigger (before) // This trigger can be used to set an alternative output using a different search method $output = ModuleHandler::triggerCall('document.getDocumentList', 'before', $obj); - if($output instanceof Object && !$output->toBool()) + if($output instanceof BaseObject && !$output->toBool()) { return $output; } // If an alternate output is set, use it instead of running the default queries - $use_alternate_output = (isset($obj->use_alternate_output) && $obj->use_alternate_output instanceof Object); + $use_alternate_output = (isset($obj->use_alternate_output) && $obj->use_alternate_output instanceof BaseObject); if (!$use_alternate_output) { $this->_setSearchOption($obj, $args, $query_id, $use_division); diff --git a/modules/editor/editor.controller.php b/modules/editor/editor.controller.php index 7f321297b..6110e2695 100644 --- a/modules/editor/editor.controller.php +++ b/modules/editor/editor.controller.php @@ -60,7 +60,7 @@ class editorController extends editor if(method_exists($oComponent, $method)) $output = $oComponent->{$method}(); else return $this->setError('%s method is not exists', $method); - if($output instanceof Object && !$output->toBool()) return $output; + if($output instanceof BaseObject && !$output->toBool()) return $output; $this->setError($oComponent->getError()); $this->setMessage($oComponent->getMessage()); diff --git a/modules/file/file.model.php b/modules/file/file.model.php index 8bb9b2c62..9a41b0b66 100644 --- a/modules/file/file.model.php +++ b/modules/file/file.model.php @@ -68,7 +68,7 @@ class fileModel extends file } $tmp_files = $this->getFiles($upload_target_srl); - if($tmp_files instanceof Object && !$tmp_files->toBool()) return $tmp_files; + if($tmp_files instanceof BaseObject && !$tmp_files->toBool()) return $tmp_files; $files = array(); foreach($tmp_files as $file_info) diff --git a/modules/install/script/ko.install.php b/modules/install/script/ko.install.php index f591ed9a0..3e2484f9f 100644 --- a/modules/install/script/ko.install.php +++ b/modules/install/script/ko.install.php @@ -148,7 +148,7 @@ function __makeMenu(&$list, $parent_srl) } $output = $oMenuAdminController->procMenuAdminInsertItem(); - if($output instanceof Object && !$output->toBool()) + if($output instanceof BaseObject && !$output->toBool()) { return $output; }