GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

ErrorAction to autodiscoverable file.

This commit is contained in:
Mikael Nordfeldth 2016-01-14 21:21:34 +01:00
parent 818fb05cfe
commit bc0a903bd4
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/action.php
View File

@ -1457,6 +1457,8 @@ class Action extends HTMLOutputter // lawsuit
break; break;
default: default:
common_log(LOG_ERR, 'Handled serverError ('._ve($code).') but cannot output into desired format ('._ve($this->format).'): '._ve($msg)); common_log(LOG_ERR, 'Handled serverError ('._ve($code).') but cannot output into desired format ('._ve($this->format).'): '._ve($msg));
$action = new ServerErrorAction($msg, $code);
$action->execute();
} }
exit((int)$code); exit((int)$code);
@ -1513,6 +1515,8 @@ class Action extends HTMLOutputter // lawsuit
break; break;
default: default:
common_log(LOG_ERR, 'Handled clientError ('._ve($code).') but cannot output into desired format ('._ve($this->format).'): '._ve($msg)); common_log(LOG_ERR, 'Handled clientError ('._ve($code).') but cannot output into desired format ('._ve($this->format).'): '._ve($msg));
$action = new ClientErrorAction($msg, $code);
$action->execute();
} }
exit((int)$code); exit((int)$code);
} }

6
lib/clienterroraction.php
View File

@ -28,11 +28,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('STATUSNET') && !defined('LACONICA')) { if (!defined('GNUSOCIAL')) { exit(1); }
exit(1);
}
require_once INSTALLDIR . '/lib/error.php';
/** /**
* Class for displaying HTTP client errors * Class for displaying HTTP client errors

0
lib/error.php → lib/erroraction.php
View File

6
lib/servererroraction.php
View File

@ -29,11 +29,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('STATUSNET') && !defined('LACONICA')) { if (!defined('GNUSOCIAL')) { exit(1); }
exit(1);
}
require_once INSTALLDIR.'/lib/error.php';
/** /**
* Class for displaying HTTP server errors * Class for displaying HTTP server errors