Local_group and User are now assumed to be in same namespace

This commit is contained in:
Mikael Nordfeldth
2013-10-17 01:16:03 +02:00
parent cd0e3f1fa4
commit 6ed66d9c76
15 changed files with 200 additions and 342 deletions

View File

@@ -39,19 +39,18 @@ if (!defined('GNUSOCIAL')) { exit(1); }
* @link http://status.net/
*/
class NoProfileException extends NoProfileException
class NoProfileException extends ServerException
{
public $profile_id = null;
public function __construct($profile_id, $msg=null)
{
$this->id = (int)$profile_id;
$this->id = $profile_id;
if ($msg === null) {
// 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).
$msg = sprintf(_('User %1$s (%2$d) has no profile record.'),
$group->nickname, $group->id);
$msg = sprintf(_('There is no profile with id==%u'), $this->id);
}
parent::__construct($msg, 404);