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

Merge branch 'release/1.7.8' into develop

Browse source 
Conflicts:
	classes/context/Context.class.php
	config/config.inc.php
This commit is contained in:
bnu 2014-12-09 15:13:08 +09:00
commit 4506ea440e
50 changed files with 4086 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@ class ModuleObject extends Object
var $layout_path = ''; ///< a path of directory where layout files reside
var $layout_file = ''; ///< name of layout file
var $edited_layout_file = ''; ///< name of temporary layout files that is modified in an admin mode
var $stop_proc = false; ///< a flag to indicating whether to stop the execution of code.
var $stop_proc = FALSE; ///< a flag to indicating whether to stop the execution of code.
var $module_config = NULL;
var $ajaxRequestMethod = array('XMLRPC', 'JSON');
var $gzhandler_enable = TRUE;
@ -385,7 +385,7 @@ class ModuleObject extends Object
if($this->stop_proc)
{
debugPrint($this->message, 'ERROR');
return false;
return FALSE;
}
// trigger call
@ -394,7 +394,7 @@ class ModuleObject extends Object
{
$this->setError($triggerOutput->getError());
$this->setMessage($triggerOutput->getMessage());
return false;
return FALSE;
}
// execute an addon(call called_position as before_module_proc)
@ -444,7 +444,7 @@ class ModuleObject extends Object
}
else
{
return false;
return FALSE;
}
// trigger call
@ -453,7 +453,7 @@ class ModuleObject extends Object
{
$this->setError($triggerOutput->getError());
$this->setMessage($triggerOutput->getMessage());
return false;
return FALSE;
}
// execute an addon(call called_position as after_module_proc)
@ -469,7 +469,7 @@ class ModuleObject extends Object
if(!$output->toBool())
{
return false;
return FALSE;
}
}
// execute api methos of the module if view action is and result is XMLRPC or JSON
@ -484,8 +484,9 @@ class ModuleObject extends Object
}
}
}
return true;
return TRUE;
}
}
?>
/* End of file ModuleObject.class.php */
/* Location: ./classes/module/ModuleObject.class.php */