Version 5.0.6
This commit is contained in:
1 parent
a3a4a9ccbd
commit
b89858b2ff
1214 files changed
+92828
-14859
No files matched your search
@@ -569,7 +569,7 @@ class Forum extends Model implements Permissions
|
||||
}
|
||||
|
||||
$lastPostData = [
|
||||
$updatedItem->last_post . $updatedItem->tid => [
|
||||
$updatedItem->last_post . '.' . $updatedItem->tid => [
|
||||
'last_post' => $updatedItem->last_post,
|
||||
'last_poster_id' => $updatedItem->last_poster_id,
|
||||
'last_poster_name' => $updatedItem->last_poster_name,
|
||||
@@ -634,8 +634,12 @@ class Forum extends Model implements Permissions
|
||||
$lastPost['last_poster_name'] = $topic->last_poster_name;
|
||||
}
|
||||
|
||||
if( $lastPost['last_poster_id'] AND !empty( $lastPost['last_poster_name'] ) )
|
||||
{
|
||||
$lastPost['seo_last_name'] = Friendly::seoTitle( $lastPost['last_poster_name'] );
|
||||
}
|
||||
|
||||
$lastPost['last_post'] = ( $lastComment ? $lastComment->post_date : $topic->last_post );
|
||||
$lastPost['seo_last_name'] = Friendly::seoTitle( $lastPost['last_poster_name'] );
|
||||
$lastPost['last_title'] = $topic->title;
|
||||
$lastPost['seo_last_title'] = Friendly::seoTitle( $topic->title );
|
||||
$lastPost['last_id'] = $topic->tid;
|
||||
@@ -643,7 +647,7 @@ class Forum extends Model implements Permissions
|
||||
$lastPost['last_post_snippet'] = $lastComment?->truncated( true, 350 );
|
||||
$lastPost['posts'] = $topic->posts - 1;
|
||||
|
||||
$lastPostData[ $topic->last_post . $topic->tid ] = $lastPost;
|
||||
$lastPostData[ $topic->last_post . '.' . $topic->tid ] = $lastPost;
|
||||
}
|
||||
}
|
||||
catch ( UnderflowException $e ){}
|
||||
@@ -877,9 +881,10 @@ class Forum extends Model implements Permissions
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Default to a guest account so we can be sure the author is never null */
|
||||
$results[ $timestamp ]['author'] = new Member;
|
||||
if ( $data['_author'] and is_string( $data['_author'] ) )
|
||||
{
|
||||
$results[ $timestamp ]['author'] = new Member;
|
||||
$results[ $timestamp ]['author']->name = $data['_author'];
|
||||
}
|
||||
}
|
||||
@@ -1268,19 +1273,32 @@ class Forum extends Model implements Permissions
|
||||
'forum_permission_showtopic',
|
||||
'forum_permission_custom_error',
|
||||
"form_{$id}_header_permissions",
|
||||
"form_{$id}_tab_forum_display",
|
||||
"ipsTabs_form_{$id}_forum_display",
|
||||
'forum_disable_sharelinks',
|
||||
"form_{$id}_tab_posting_settings",
|
||||
"ipsTabs_form_{$id}_posting_settings",
|
||||
"form_{$id}_header_forum_display_topic",
|
||||
"form_{$id}_tab_permissions",
|
||||
"ipsTabs_form_{$id}_permissions",
|
||||
'forum_preview_posts',
|
||||
'forum_icon_choose',
|
||||
'forum_sort_key',
|
||||
'forum_feature_color'
|
||||
'forum_feature_color',
|
||||
'forum_skin_id',
|
||||
"form_{$id}_header_forum_solved_options",
|
||||
"forum_solved_mode",
|
||||
"forum_enable_assignments",
|
||||
"bw_fluid_view",
|
||||
"form_{$id}_header_forum_display_forum",
|
||||
"ipsTabs_form_{$id}_forum_rules",
|
||||
"ipsTabs_form_{$id}_topic_and_post_settings",
|
||||
),
|
||||
'category' => array(
|
||||
"form_{$id}_tab_forum_display",
|
||||
'forum_feature_color'
|
||||
"ipsTabs_form_{$id}_forum_display",
|
||||
'forum_feature_color',
|
||||
'forum_skin_id',
|
||||
"bw_fluid_view",
|
||||
"form_{$id}_header_forum_display_forum",
|
||||
"ipsTabs_form_{$id}_forum_rules",
|
||||
"ipsTabs_form_{$id}_topic_and_post_settings",
|
||||
),
|
||||
'redirect' => array(
|
||||
'forum_password_on',
|
||||
@@ -1456,7 +1474,7 @@ class Forum extends Model implements Permissions
|
||||
'forum_rules_text'
|
||||
),
|
||||
)
|
||||
) ) );
|
||||
), null, null, null, "forum_show_rules" ) );
|
||||
|
||||
$form->add( new Translatable( 'forum_rules_title', NULL, FALSE, array( 'app' => 'forums', 'key' => ( $this->id ? "forums_forum_{$this->id}_rulestitle" : NULL ) ), NULL, NULL, NULL, 'forum_rules_title' ) );
|
||||
$form->add( new Translatable( 'forum_rules_text', NULL, FALSE, array( 'app' => 'forums', 'key' => ( $this->id ? "forums_forum_{$this->id}_rules" : NULL ), 'editor' => array( 'app' => 'forums', 'key' => 'Forums', 'autoSaveKey' => ( $this->id ? "forums-rules-{$this->id}" : "forums-new-rules" ), 'attachIds' => $this->id ? array( $this->id, NULL, 'rules' ) : NULL ) ), NULL, NULL, NULL, 'forum_rules_text' ) );
|
||||
@@ -2309,7 +2327,7 @@ class Forum 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
|
||||
{
|
||||
/* @var Topic $itemClass */
|
||||
$itemClass = static::$contentItemClass;
|
||||
|
||||
Reference in new issue
Block a user