Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/Common/Service/ErrorHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ public function showFatalErrorScreen($sSubject = '', $sMessage = '', $oDetails =
// --------------------------------------------------------------------------

/**
* Renders the 404 page and halts script execution
* Renders the 404 page andhaltscript execution
*
* @param bool $bLogError Whether to log the error
*
Expand Down Expand Up @@ -356,7 +356,7 @@ public function show404(bool $bLogError = false)
// --------------------------------------------------------------------------

/**
* Renders the 401 page and halts script execution
* Renders the 401 page andhaltscript execution
*
* @param string $sFlashMessage The flash message to display to the user
* @param string $sReturnUrl The URL to return to after logging in
Expand Down Expand Up @@ -670,9 +670,13 @@ protected static function instantiateMockController()

require_once BASEPATH . 'core/Controller.php';

// Match pocketarc/codeigniter system/core/CodeIgniter.php:
// Security requires $charset; Input requires the Security instance.
$sCharset = strtoupper((string) config_item('charset'));
$oSecurity =& load_class('Security', 'core', $sCharset);

load_class('Output', 'core');
load_class('Security', 'core');
load_class('Input', 'core');
load_class('Input', 'core', $oSecurity);
load_class('Lang', 'core');

new NailsMockController();
Expand Down
Loading