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

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7672 201d5d3c-b55e-5fd7-737f-ddc643e51545

Browse source
This commit is contained in:
ChanMyeong 2010-09-06 02:35:00 +00:00
parent 816e77f1a6
commit ceffd850b5
2 changed files with 309 additions and 307 deletions
Download patch file Download diff file Expand all files Collapse all files

26
classes/module/ModuleHandler.class.php
View file

@ -173,11 +173,12 @@
function procModule() {
// If error occurred while preparation, return a message instance
if($this->error) {
$oMessageView = &getView('message');
$oMessageView->setError(-1);
$oMessageView->setMessage($this->error);
$oMessageView->dispMessage();
return $oMessageView;
$type = Mobile::isFromMobilePhone() ? 'mobile' : 'view';
$oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
$oMessageObject->setError(-1);
$oMessageObject->setMessage($this->error);
$oMessageObject->dispMessage();
return $oMessageObject;
}
$oModuleModel = &getModel('module');
@ -336,19 +337,20 @@
// If error occurred, handle it
if($this->error) {
// display content with message module instance
$oMessageView = &getView('message');
$oMessageView->setError(-1);
$oMessageView->setMessage($this->error);
$oMessageView->dispMessage();
$type = Mobile::isFromMobilePhone() ? 'mobile' : 'view';
$oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
$oMessageObject->setError(-1);
$oMessageObject->setMessage($this->error);
$oMessageObject->dispMessage();
// If module was called normally, change the templates of the module into ones of the message view module
if($oModule) {
$oModule->setTemplatePath($oMessageView->getTemplatePath());
$oModule->setTemplateFile($oMessageView->getTemplateFile());
$oModule->setTemplatePath($oMessageObject->getTemplatePath());
$oModule->setTemplateFile($oMessageObject->getTemplateFile());
// Otherwise, set message instance as the target module
} else {
$oModule = $oMessageView;
$oModule = $oMessageObject;
}
}