GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

NoProfileException collision avoidance fix

This commit is contained in:
Mikael Nordfeldth 2014-05-26 14:36:41 +02:00
parent ba10da27da
commit e83b2e147a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Notice.php
View File

@ -2521,7 +2521,7 @@ class Notice extends Managed_DataObject
$notice->_setProfile($map[$notice->profile_id]); $notice->_setProfile($map[$notice->profile_id]);
} }
} catch (NoProfileException $e) { } catch (NoProfileException $e) {
common_log(LOG_WARNING, "Failed to fill profile in Notice with non-existing entry for profile_id: {$e->id}"); common_log(LOG_WARNING, "Failed to fill profile in Notice with non-existing entry for profile_id: {$e->profile_id}");
unset($notices[$entry]); unset($notices[$entry]);
} }
} }

6
lib/noprofileexception.php
View File

@ -45,12 +45,12 @@ class NoProfileException extends ServerException
public function __construct($profile_id, $msg=null) public function __construct($profile_id, $msg=null)
{ {
$this->id = $profile_id; $this->profile_id = $profile_id;
if ($msg === null) { if ($msg === null) {
// TRANS: Exception text shown when no profile can be found for a 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). // TRANS: %u is a profile ID (number).
$msg = sprintf(_('There is no profile with id==%u'), $this->id); $msg = sprintf(_('There is no profile with id==%u'), $this->profile_id);
} }
parent::__construct($msg, 404); parent::__construct($msg, 404);