Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / lib / serverexception.php

diff --git a/lib/serverexception.php b/lib/serverexception.php
index 4ce3887e4975d331e8ea29e1046e5ef443efbf77..764e11c0fc6c577620783fbb7751ccd2df48d20d 100644 (file)
--- a/lib/serverexception.php
+++ b/lib/serverexception.php
@@ -21,13 +21,13 @@
  *
  * @category  Exception
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2008 StatusNet, Inc.
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2008-2010 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -38,14 +38,14 @@ if (!defined('LACONICA')) {
  *
  * @category Exception
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class ServerException extends Exception
 {
-    public function __construct($message = null, $code = 400) {
+    public function __construct($message = null, $code = 500) {
         parent::__construct($message, $code);
     }