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 b8ed6846e741e33626895831e2eaa6391d7bf381..764e11c0fc6c577620783fbb7751ccd2df48d20d 100644 (file)
--- a/lib/serverexception.php
+++ b/lib/serverexception.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * class for a server exception (user error)
  *
@@ -20,14 +20,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Exception
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2008 Control Yourself, Inc.
+ * @package   StatusNet
+ * @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);
 }
 
@@ -37,15 +37,15 @@ if (!defined('LACONICA')) {
  * Subclass of PHP Exception for server errors. The user typically can't fix these.
  *
  * @category Exception
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @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);
     }