summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-18 17:19:28 -0700
committerBrion Vibber <brion@pobox.com>2010-03-18 17:19:28 -0700
commit3e2e88b0dfb0f5b3baa336a9b3f69e8e8244c8e6 (patch)
tree7de5edd8b9c74d5a29f7443b1a52a269f5f9d6e3 /lib
parent9c5af9a38f82afee92a78303aaa4604794ef6866 (diff)
parent01a1e882afeb78542b02e4643c5d8a2fa50c2206 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib')
-rw-r--r--lib/activity.php4
-rw-r--r--lib/usernoprofileexception.php74
2 files changed, 76 insertions, 2 deletions
diff --git a/lib/activity.php b/lib/activity.php
index 4b724ee90..23cf50f70 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -723,7 +723,7 @@ class ActivityObject
}
}
- static function fromNotice($notice)
+ static function fromNotice(Notice $notice)
{
$object = new ActivityObject();
@@ -737,7 +737,7 @@ class ActivityObject
return $object;
}
- static function fromProfile($profile)
+ static function fromProfile(Profile $profile)
{
$object = new ActivityObject();
diff --git a/lib/usernoprofileexception.php b/lib/usernoprofileexception.php
new file mode 100644
index 000000000..6744d2529
--- /dev/null
+++ b/lib/usernoprofileexception.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * class for an exception when the user profile is missing
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Exception
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+ exit(1);
+}
+
+/**
+ * Class for an exception when the user profile is missing
+ *
+ * @category Exception
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link http://status.net/
+ */
+
+class UserNoProfileException extends ServerException
+{
+ var $user = null;
+
+ /**
+ * constructor
+ *
+ * @param User $user User that's missing a profile
+ */
+
+ public function __construct($user)
+ {
+ $this->user = $user;
+
+ $message = sprintf(_("User %s (%d) has no profile record."),
+ $user->nickname, $user->id);
+
+ parent::__construct($message);
+ }
+
+ /**
+ * Accessor for user
+ *
+ * @return User the user that triggered this exception
+ */
+
+ public function getUser()
+ {
+ return $this->user;
+ }
+}