merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -34,8 +34,6 @@
* @brief Declare constants for generic use and for checking to avoid a direct call from the Web
**/
define('__XE__', TRUE);
define('__ZBXE__', TRUE); // deprecated : __ZBXE__ will be removed. Use __XE__ instead.
/**
* @brief Include the necessary configuration files
**/
@ -55,10 +53,19 @@ if($oContext->checkSSO())
{
$oModuleHandler = new ModuleHandler();
if($oModuleHandler->init())
try
{
$oModule = &$oModuleHandler->procModule();
$oModuleHandler->displayContent($oModule);
if($oModuleHandler->init())
{
$oModule = &$oModuleHandler->procModule();
$oModuleHandler->displayContent($oModule);
}
}
catch(Exception $e)
{
htmlHeader();
echo Context::getLang($e->getMessage());
htmlFooter();
}
}