diff --git a/htdocs/lang/en.utf8/activity.php b/htdocs/lang/en.utf8/activity.php index 5195c7fbe6d60bf516ab1e5c24329c0ecef7d48e..74705d5608e56868b6b238ed6d75925b0f76e669 100644 --- a/htdocs/lang/en.utf8/activity.php +++ b/htdocs/lang/en.utf8/activity.php @@ -68,7 +68,7 @@ $string['stopmonitoringsuccess'] = 'Stopped monitoring successfully'; $string['stopmonitoringfailed'] = 'Failed to stop monitoring'; $string['newwatchlistmessage'] = 'New activity on your watchlist'; -$string['newwatchlistmessageview'] = '%s has changed their page "%s"'; +$string['newwatchlistmessageview1'] = 'The page "%s" belonging to %s has been changed'; $string['newviewsubject'] = 'New page created'; $string['newviewmessage'] = '%s has created a new page "%s"'; diff --git a/htdocs/lib/activity.php b/htdocs/lib/activity.php index beb5378246c26b5979588b664b1608e3c604cede..552ed0fd83979f647604e28677b5aa6f58ff5694 100644 --- a/htdocs/lib/activity.php +++ b/htdocs/lib/activity.php @@ -831,7 +831,7 @@ class ActivityTypeWatchlist extends ActivityType { require_once('view.php'); if ($this->viewinfo = new View($this->view)) { - $this->ownerinfo = $this->viewinfo->get_owner_object(); + $this->ownerinfo = hsc($this->viewinfo->formatted_owner()); } if (empty($this->ownerinfo)) { if (!empty($this->cron)) { // probably deleted already @@ -888,8 +888,8 @@ class ActivityTypeWatchlist extends ActivityType { } public function get_message($user) { - return get_string_from_language($user->lang, 'newwatchlistmessageview', 'activity', - display_name($this->ownerinfo, $user), $this->viewinfo->get('title')); + return get_string_from_language($user->lang, 'newwatchlistmessageview1', 'activity', + $this->viewinfo->get('title'), $this->ownerinfo); } public function get_required_parameters() {