forked from GNUsocial/gnu-social
[CORE] Fix subscriptions and subscribers list (related to 44653d339d
)
This commit is contained in:
parent
44653d339d
commit
83a05724b8
@ -92,7 +92,7 @@ class SubscribersAction extends GalleryAction
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($subscribers) {
|
if ($subscribers) {
|
||||||
$subscribers_list = new SubscribersList($subscribers, $this->target, $this);
|
$subscribers_list = new SubscribersList($subscribers, $this->target->getUser(), $this);
|
||||||
$cnt = $subscribers_list->show();
|
$cnt = $subscribers_list->show();
|
||||||
if (0 == $cnt) {
|
if (0 == $cnt) {
|
||||||
$this->showEmptyListMessage();
|
$this->showEmptyListMessage();
|
||||||
|
@ -96,7 +96,7 @@ class SubscriptionsAction extends GalleryAction
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($subscriptions) {
|
if ($subscriptions) {
|
||||||
$subscriptions_list = new SubscriptionsList($subscriptions, $this->target, $this);
|
$subscriptions_list = new SubscriptionsList($subscriptions, $this->target->getUser(), $this);
|
||||||
$cnt = $subscriptions_list->show();
|
$cnt = $subscriptions_list->show();
|
||||||
if (0 == $cnt) {
|
if (0 == $cnt) {
|
||||||
$this->showEmptyListMessage();
|
$this->showEmptyListMessage();
|
||||||
|
@ -32,7 +32,7 @@ defined('GNUSOCIAL') || die();
|
|||||||
define('GNUSOCIAL_ENGINE', 'GNU social');
|
define('GNUSOCIAL_ENGINE', 'GNU social');
|
||||||
define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/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_LIFECYCLE', 'release'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
|
||||||
|
|
||||||
define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE);
|
define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE);
|
||||||
|
@ -46,7 +46,7 @@ class ProfileList extends Widget
|
|||||||
/** Action object using us. */
|
/** Action object using us. */
|
||||||
var $action = null;
|
var $action = null;
|
||||||
|
|
||||||
function __construct($profile, HTMLOutputter $action=null)
|
function __construct($profile, HTMLOutputter $action = null)
|
||||||
{
|
{
|
||||||
parent::__construct($action);
|
parent::__construct($action);
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ class SubscriptionList extends ProfileList
|
|||||||
/** Owner of this list */
|
/** Owner of this list */
|
||||||
var $owner = null;
|
var $owner = null;
|
||||||
|
|
||||||
public function __construct($profile, $owner=null, $action=null)
|
public function __construct($profile, $owner = null, $action = null)
|
||||||
{
|
{
|
||||||
parent::__construct($profile, $action);
|
parent::__construct($profile, $action);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user