Bug 1794370: Use correct owner for watchlist message

When sending watchlist notification for block changes in a view

behatnotneeded

Change-Id: Ieeb89c6662acabd8438486702e10433ea6feab70
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 0866ac93)

htdocs/lib/activity.php

@@ -1228,8 +1228,8 @@ class ActivityTypeWatchlist extends ActivityType {
 
     protected $view;
 
-    private $ownerinfo;
-    private $viewinfo;
+    protected $ownerinfo;
+    protected $viewinfo;
 
     /**
      * @param array $data Parameters:
@@ -1311,7 +1311,6 @@ class ActivityTypeWatchlist extends ActivityType {
  */
 class ActivityTypeWatchlistnotification extends ActivityTypeWatchlist{
     protected $view;
-    protected $viewinfo;
     protected $blocktitles = array();
     protected $usr;
 
@@ -1326,9 +1325,6 @@ class ActivityTypeWatchlistnotification extends ActivityTypeWatchlist{
 
         $this->blocktitles = $data->blocktitles;
         $this->usr = $data->usr;
-
-
-        $this->viewinfo = new View($this->view);
     }
 
     /**
@@ -1340,7 +1336,7 @@ class ActivityTypeWatchlistnotification extends ActivityTypeWatchlist{
      */
     public function get_message($user) {
         $message = get_string_from_language($user->lang, 'newwatchlistmessageview1', 'activity',
-                                        $this->viewinfo->get('title'), display_name($this->usr, $user));
+                                        $this->viewinfo->get('title'), $this->ownerinfo);
 
         try {
             foreach ($this->blocktitles as $blocktitle) {