Index: branches/5.0.x/core/kernel/processors/main_processor.php =================================================================== diff -u -r12716 -r12726 --- branches/5.0.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 12716) +++ branches/5.0.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 12726) @@ -1,6 +1,6 @@ Application->IsAdmin() || $force_admin) { + if ($this->Application->isAdmin || $force_admin) { if ($module == 'in-portal') { $module = 'kernel'; } @@ -227,12 +227,12 @@ if (array_key_exists($name, $this->Application->Parser->Captures)) { $capture_params = $params; $capture_params['name'] = '__capture_' . $name; - + $this->Application->Parser->SetParam($name, $this->Application->ParseBlock($capture_params)); } - + $res = $this->Application->Parser->GetParam($name); - + if ($res === false) { $res = ''; } @@ -587,15 +587,15 @@ $module_key = mb_strtolower($module_name); if ($module_name == 'In-Portal') { - if (!$cms_mode && $this->Application->IsAdmin()) { + if (!$cms_mode && $this->Application->isAdmin) { // don't process In-Portal templates in admin continue; } // Front-End still relies on In-Portal module $module_prefix = $module_data['TemplatePath']; } - elseif ($this->Application->IsAdmin()) { + elseif ($this->Application->isAdmin) { $module_prefix = $module_data['Path']; // was $module_key . '/'; } else { @@ -805,7 +805,7 @@ */ function CheckSSL($params) { - $ssl = $this->Application->IsAdmin() ? $this->Application->ConfigValue('AdminSSL_URL') : false; + $ssl = $this->Application->isAdmin ? $this->Application->ConfigValue('AdminSSL_URL') : false; if (!$ssl) { // not in admin or admin ssl url is empty