Version 5.0.13
This commit is contained in:
1 parent
b89858b2ff
commit
5efe744c5f
1407 files changed
+69690
-30177
No files matched your search
@@ -423,7 +423,18 @@ class Categories extends Model implements Permissions
|
||||
if( array_key_exists( 'page_can_view', $values ) )
|
||||
{
|
||||
$this->club_view_permission= implode( ",", $values['page_can_view'] );
|
||||
$values['club_node_public'] = intval( in_array( 'nonmember', $values['page_can_view'] ) or mb_strpos( '*', $this->club_view_permission ) !== false );
|
||||
if( !in_array( 'nonmember', $values['page_can_view'] ) and !in_array( 'member', $values['page_can_view'] ) )
|
||||
{
|
||||
$values['club_node_public'] = Club::NODE_MODERATORS;
|
||||
}
|
||||
elseif( in_array( 'nonmember', $values['page_can_view'] ) or mb_strpos( '*', $this->club_view_permission ) !== false )
|
||||
{
|
||||
$values['club_node_public'] = Club::NODE_PUBLIC;
|
||||
}
|
||||
else
|
||||
{
|
||||
$values['club_node_public'] = Club::NODE_PRIVATE;
|
||||
}
|
||||
unset( $values['page_can_view'] );
|
||||
}
|
||||
|
||||
@@ -2243,7 +2254,7 @@ class Categories extends Model implements Permissions
|
||||
*/
|
||||
public function metaDescription(): ?string
|
||||
{
|
||||
return $this->meta_description ?: static::database()->metaDescription();
|
||||
return $this->meta_description ?: parent::metaDescription();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2253,7 +2264,7 @@ class Categories extends Model implements Permissions
|
||||
*/
|
||||
public function metaTitle(): string
|
||||
{
|
||||
return $this->page_title ?: static::database()->metaTitle();
|
||||
return $this->page_title ?: parent::metaTitle();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user