If mobile layout is not set, do not use mobile view

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7519 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
haneul 2010-06-17 10:11:03 +00:00
parent 99e0e80620
commit 1f41848b5e

View file

@ -204,6 +204,8 @@
$kind = strpos(strtolower($this->act),'admin')!==false?'admin':'';
if(!$kind && $this->module == 'admin') $kind = 'admin';
if(!$this->module_info->mlayout_srl) Mobile::setMobile(false);
// if(type == view, and case for using mobilephone)
if($type == "view" && Mobile::isFromMobilePhone() && Context::isInstalled())
{
@ -213,6 +215,7 @@
$oModule = &$this->getModuleInstance($this->module, $type, $kind);
if(!is_object($oModule) || !method_exists($oModule, $this->act)) {
$type = $orig_type;
Mobile::setMobile(false);
$oModule = &$this->getModuleInstance($this->module, $type, $kind);
}
}