This commit is contained in:
Sam Georges 2014-11-01 12:03:38 +11:00
parent c83797231d
commit 2011a21e6f
2 changed files with 5 additions and 5 deletions

View File

@ -977,10 +977,10 @@ class Lists extends WidgetBase
$this->sortColumn = $sortOptions['column'];
$this->sortDirection = $sortOptions['direction'];
}
/*
* Supplied default
*/
else {
/*
* Supplied default
*/
if (is_string($this->defaultSort)) {
$this->sortColumn = $this->defaultSort;
$this->sortDirection = 'desc';

View File

@ -62,13 +62,13 @@ class ErrorHandler
// If the exception is already our brand, use it.
if ($proposedException instanceof BaseException) {
$exception = $proposedException;
// If there is an active mask prepared, use that.
}
// If there is an active mask prepared, use that.
elseif (static::$activeMask !== null) {
$exception = static::$activeMask;
$exception->setMask($proposedException);
// Otherwise we should mask it with our own default scent.
}
// Otherwise we should mask it with our own default scent.
else {
$exception = new ApplicationException($proposedException->getMessage(), 0);
$exception->setMask($proposedException);