Misses this file to merge. I like the comments.

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

diff --git a/lib/usernoprofileexception.php b/lib/usernoprofileexception.php
index e0186fef971a05664bfc98a33984ca83789e5325..83478040c2ba95c0c2dc5b9185aea3a6c261fe25 100644 (file)
--- a/lib/usernoprofileexception.php
+++ b/lib/usernoprofileexception.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * class for an exception when the user profile is missing
+ * Class for an exception when the user profile is missing
  *
  * PHP version 5
  *
@@ -27,9 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Class for an exception when the user profile is missing
@@ -41,9 +39,9 @@ if (!defined('STATUSNET')) {
  * @link     http://status.net/
  */
 
-class UserNoProfileException extends ServerException
+class UserNoProfileException extends NoProfileException
 {
-    var $user = null;
+    protected $user = null;
 
     /**
      * constructor
@@ -51,16 +49,16 @@ class UserNoProfileException extends ServerException
      * @param User $user User that's missing a profile
      */
 
-    public function __construct($user)
+    public function __construct(User $user)
     {
         $this->user = $user;
 
         // TRANS: Exception text shown when no profile can be found for a user.
         // TRANS: %1$s is a user nickname, $2$d is a user ID (number).
-        $message = sprintf(_("User %1$s (%2$d) has no profile record."),
+        $message = sprintf(_('User %1$s (%2$d) has no profile record.'),
                            $user->nickname, $user->id);
 
-        parent::__construct($message);
+        parent::__construct($user->id, $message);
     }
 
     /**