fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 03:32:00 +09:00
Code Issues Projects Releases Packages Wiki Activity

Convert Object class to BaseObject in core classes

Browse source
This commit is contained in:
Kijin Sung 2017-11-27 22:34:28 +09:00
parent 5bdf95932f
commit 1a81fd43f3
16 changed files with 129 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

8
classes/module/ModuleObject.class.php
View file

@ -6,7 +6,7 @@
* @author NAVER (developers@xpressengine.com)
* base class of ModuleHandler
* */
class ModuleObject extends Object
class ModuleObject extends BaseObject
{
var $mid = NULL; ///< string to represent run-time instance of Module (XE Module)
@ -561,7 +561,7 @@ class ModuleObject extends Object
}
// check return value of action
if($output instanceof Object)
if($output instanceof BaseObject)
{
$this->setError($output->getError());
$this->setMessage($output->getMessage());
@ -587,11 +587,11 @@ class ModuleObject extends Object
$addon_file = $oAddonController->getCacheFilePath($is_mobile ? "mobile" : "pc");
if(FileHandler::exists($addon_file)) include($addon_file);
if($original_output instanceof Object && !$original_output->toBool())
if($original_output instanceof BaseObject && !$original_output->toBool())
{
return FALSE;
}
elseif($output instanceof Object && $output->getError())
elseif($output instanceof BaseObject && $output->getError())
{
$this->setError($output->getError());
$this->setMessage($output->getMessage());