joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Updated Controller to handle fatal errors directly instead of throwing an exception.

Browse source
This commit is contained in:
Josh Sherman 2010-11-07 00:09:33 -04:00
parent 93541bc788
commit 6639fae6ed
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
classes/Controller.php
View file

@ -74,7 +74,7 @@ class Controller extends Object
// Generate a generic "site down" message if the site is set to be disabled
if (isset($this->config->pickles['disabled']) && $this->config->pickles['disabled'] == true)
{
throw new Exception($_SERVER['SERVER_NAME'] . ' is currently<br />down for maintenance');
Error::fatal($_SERVER['SERVER_NAME'] . ' is currently<br />down for maintenance');
}
// Loads the requested module's information
@ -194,7 +194,7 @@ class Controller extends Object
{
if (!isset($_REQUEST['request']))
{
throw new Exception('Way to go, you\'ve successfully created an infinite redirect loop. Good thing I was here or you would have been served with a pretty ugly browser error.<br /><br />So here\'s the deal, no templates were able to be loaded. Make sure your parent and child templates actually exist and if you\'re using non-default values, make sure they\'re defined correctly in your config.');
Error::fatal('Way to go, you\'ve successfully created an infinite redirect loop. Good thing I was here or you would have been served with a pretty ugly browser error.<br /><br />So here\'s the deal, no templates were able to be loaded. Make sure your parent and child templates actually exist and if you\'re using non-default values, make sure they\'re defined correctly in your config.');
}
else
{