[CORE] Fix subscriptions and subscribers list (related to 44653d339d)

diff --git a/actions/subscribers.php b/actions/subscribers.php
index 81ab70e21e87acd8079969a973c7637e65bebe97..87489fb69a37e8842e462656149366c0df736b56 100644 (file)
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -92,7 +92,7 @@ class SubscribersAction extends GalleryAction
         }
 
         if ($subscribers) {
-            $subscribers_list = new SubscribersList($subscribers, $this->target, $this);
+            $subscribers_list = new SubscribersList($subscribers, $this->target->getUser(), $this);
             $cnt = $subscribers_list->show();
             if (0 == $cnt) {
                 $this->showEmptyListMessage();

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 6e9e163d332afce567aa394ff1a45b044aa15b3a..152c5f6f25e61840e8f8b08d7194991a6cd17888 100644 (file)
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -96,7 +96,7 @@ class SubscriptionsAction extends GalleryAction
             }
 
             if ($subscriptions) {
-                $subscriptions_list = new SubscriptionsList($subscriptions, $this->target, $this);
+                $subscriptions_list = new SubscriptionsList($subscriptions, $this->target->getUser(), $this);
                 $cnt = $subscriptions_list->show();
                 if (0 == $cnt) {
                     $this->showEmptyListMessage();

diff --git a/lib/framework.php b/lib/framework.php
index 18fc84c2ff099063401b114d1c21ade731c7728d..ebeb61b26033038b58a8c0b9a7ffbc2036cbee61 100644 (file)
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -32,7 +32,7 @@ defined('GNUSOCIAL') || die();
 define('GNUSOCIAL_ENGINE', 'GNU social');
 define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/social/');
 
-define('GNUSOCIAL_BASE_VERSION', '1.20.3');
+define('GNUSOCIAL_BASE_VERSION', '1.20.4');
 define('GNUSOCIAL_LIFECYCLE', 'release'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 
 define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE);

diff --git a/lib/profilelist.php b/lib/profilelist.php
index 9f735b1b88d8d02e61a8be4f91cb34fb01f2f0d4..633a31a9d7ffaf6a493f4dffb085c644efd4a667 100644 (file)
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -46,7 +46,7 @@ class ProfileList extends Widget
     /** Action object using us. */
     var $action = null;
 
-    function __construct($profile, HTMLOutputter $action=null)
+    function __construct($profile, HTMLOutputter $action = null)
     {
         parent::__construct($action);
 

diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index 6f4d1a4a734d24a48a12d128dfd6c0541cbbafb4..688ede3fbdba94ac680d808e455fc56eb6bd660d 100644 (file)
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -44,7 +44,7 @@ class SubscriptionList extends ProfileList
     /** Owner of this list */
     var $owner = null;
 
-    public function __construct($profile, $owner=null, $action=null)
+    public function __construct($profile, $owner = null, $action = null)
     {
         parent::__construct($profile, $action);