Version 5.0.6
This commit is contained in:
1 parent
a3a4a9ccbd
commit
b89858b2ff
1214 files changed
+92828
-14859
No files matched your search
@@ -229,6 +229,24 @@ class Blog extends Model implements Embeddable
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check the action column map if the action is enabled in this node
|
||||
*
|
||||
* @param string $action
|
||||
* @return bool
|
||||
*/
|
||||
public function checkAction( string $action ) : bool
|
||||
{
|
||||
/* We don't want any kind of specific comment moderation here, just leave it up to the
|
||||
general rules */
|
||||
if( $action == 'moderate_comments' )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return parent::checkAction( $action );
|
||||
}
|
||||
|
||||
/**
|
||||
* Check permissions on any node
|
||||
@@ -784,31 +802,6 @@ class Blog extends Model implements Embeddable
|
||||
return $values;
|
||||
}
|
||||
|
||||
/**
|
||||
* [Node] Get the title to store in the log
|
||||
*
|
||||
* @return string|null
|
||||
*/
|
||||
public function titleForLog(): ?string
|
||||
{
|
||||
if ( !$this->member_id )
|
||||
{
|
||||
try
|
||||
{
|
||||
return Lang::load( Lang::defaultLanguage() )->get( static::$titleLangPrefix . $this->_id );
|
||||
}
|
||||
catch( UnderflowException )
|
||||
{
|
||||
/* If we're changing from a member blog to a group blog, the language string won't exist yet */
|
||||
return $this->_title;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return $this->_title;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Mass update search index after changes
|
||||
*/
|
||||
@@ -856,7 +849,7 @@ class Blog extends Model implements Embeddable
|
||||
}
|
||||
|
||||
/* The seo_name isn't set, so let's fix that real quick and return it */
|
||||
$title = $this->member_id ? $this->name : Lang::load( Lang::defaultLanguage() )->get( 'blogs_blog_' . $this->id );
|
||||
$title = Lang::load( Lang::defaultLanguage() )->get( 'blogs_blog_' . $this->id );
|
||||
|
||||
$seoTitle = Url::seoTitle( $title );
|
||||
$this->seo_name = $seoTitle;
|
||||
@@ -1024,9 +1017,9 @@ class Blog extends Model implements Embeddable
|
||||
/**
|
||||
* [Node] Get number of unapproved content comments
|
||||
*
|
||||
* @return int
|
||||
* @return int|null
|
||||
*/
|
||||
protected function get__unapprovedComments(): int
|
||||
protected function get__unapprovedComments(): ?int
|
||||
{
|
||||
return $this->count_comments_hidden;
|
||||
}
|
||||
@@ -1351,7 +1344,7 @@ class Blog extends Model implements Embeddable
|
||||
* @param Club $club
|
||||
* @return void
|
||||
*/
|
||||
public function clubForm( Form $form, Club $club ) : void
|
||||
public function _clubForm( Form $form, Club $club ) : void
|
||||
{
|
||||
Output::i()->jsFiles = array_merge( Output::i()->jsFiles, Output::i()->js( 'front_view.js', 'blog', 'front' ) );
|
||||
|
||||
|
||||
Reference in new issue
Block a user