Version 5.0.6

This commit is contained in:
Neo committed 2025-12-19 18:55:49 -08:00
1 parent a3a4a9ccbd
commit b89858b2ff
1214 files changed
+92828 -14859

No files matched your search

@@ -76,7 +76,6 @@ class Categories extends Model implements Permissions
ClubContainer
{
ClubContainer::clubAcpTitle as public _clubAcpTitle;
ClubContainer::clubForm as public _clubForm;
ClubContainer::_saveClubForm as public _saveClubFormParent;
ClubContainer::canBeAddedToClub as public _canBeAddedToClub;
}
@@ -361,11 +360,12 @@ class Categories extends Model implements Permissions
* @param Club $club
* @return void
*/
public function clubForm( Form $form, Club $club ): void
public function _clubForm( Form $form, Club $club ): void
{
$this->database_id = static::$customDatabaseId;
static::_clubForm( $form, $club );
$itemClass = static::$contentItemClass;
$form->add( new Text( 'club_node_name', $this->_id ? $this->_title : Member::loggedIn()->language()->addToStack( static::clubFrontTitle() ), TRUE, array( 'maxLength' => 255 ) ) );
if( $club->type != Club::TYPE_PUBLIC )
{
@@ -1618,9 +1618,9 @@ class Categories extends Model implements Permissions
/**
* [Node] Get number of unapproved content items
*
* @return int
* @return int|null
*/
protected function get__unapprovedItems() : int
protected function get__unapprovedItems() : ?int
{
return $this->records_queued;
}
@@ -1701,7 +1701,7 @@ class Categories extends Model implements Permissions
if ( $this->template_listing AND static::database()->use_categories )
{
$data = json_decode( $this->template_listing, true );
return ( $data['layout'] == 'custom' ) ? $data['template'] : 'listing';
return ( $data['layout'] == 'custom' and $data['template'] ) ? $data['template'] : 'listing';
}
return static::database()->template_listing;