mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-04-02 01:52:10 +09:00
18947649 : apply mlayout even when the module is forwarded
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7526 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
3dded8ed26
commit
4a61d647db
1 changed files with 18 additions and 2 deletions
|
|
@ -257,12 +257,28 @@
|
|||
}
|
||||
|
||||
if($forward->module && $forward->type && $forward->act && $forward->act == $this->act) {
|
||||
|
||||
$kind = strpos(strtolower($forward->act),'admin')!==false?'admin':'';
|
||||
$type = $forward->type;
|
||||
$tpl_path = $oModule->getTemplatePath();
|
||||
$orig_module = $oModule;
|
||||
$oModule = &$this->getModuleInstance($forward->module, $type, $kind);
|
||||
|
||||
if($type == "view" && Mobile::isFromMobilePhone())
|
||||
{
|
||||
$orig_type = "view";
|
||||
$type = "mobile";
|
||||
// create a module instance
|
||||
$oModule = &$this->getModuleInstance($forward->module, $type, $kind);
|
||||
debugPrint($oModule);
|
||||
if(!is_object($oModule) || !method_exists($oModule, $this->act)) {
|
||||
$type = $orig_type;
|
||||
Mobile::setMobile(false);
|
||||
$oModule = &$this->getModuleInstance($forward->module, $type, $kind);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$oModule = &$this->getModuleInstance($forward->module, $type, $kind);
|
||||
}
|
||||
$xml_info = $oModuleModel->getModuleActionXml($forward->module);
|
||||
if($this->module == "admin" && $type == "view")
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue