X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Ferror.php;h=a6a29119f7f612046f2f2c0075167c5d03acef84;hb=8e102da76cc7466bffb67cb591927f123ed74c12;hp=5ed5dec1bda057efa4083b0b6d365cef5cdacc99;hpb=cae06a49ea60cacb926f27b18b88a8a7f801f011;p=quix0rs-gnu-social.git diff --git a/lib/error.php b/lib/error.php index 5ed5dec1bd..a6a29119f7 100644 --- a/lib/error.php +++ b/lib/error.php @@ -50,12 +50,13 @@ class ErrorAction extends Action var $message = null; var $default = null; - function __construct($message, $code, $output='php://output', $indent=true) + function __construct($message, $code, $output='php://output', $indent=null) { parent::__construct($output, $indent); $this->code = $code; $this->message = $message; + $this->minimal = StatusNet::isApi(); // XXX: hack alert: usually we aren't going to // call this page directly, but because it's @@ -102,13 +103,20 @@ class ErrorAction extends Action function showPage() { - parent::showPage(); - - // We do not want to have any more output after this + if ($this->minimal) { + // Even more minimal -- we're in a machine API + // and don't want to flood the output. + $this->extraHeaders(); + $this->showContent(); + } else { + parent::showPage(); + } + + // We don't want to have any more output after this exit(); } - // Overload a bunch of stuff so the page is not too bloated + // Overload a bunch of stuff so the page isn't too bloated function showBody() {