Version 4.6.0

applications/forums/sources/Topic/ArchivedPost.php

@@ -109,12 +109,21 @@ class _ArchivedPost extends Post
 	 * @param	\IPS\Member	$member	The memner
 	 * @return	int
 	 */
-	public static function memberPostCount( \IPS\Member $member )
+	public static function memberPostCount( \IPS\Member $member, bool $includeNonPostCountIncreasing = FALSE, bool $includeHiddenAndPendingApproval = TRUE )
 	{
-		return static::db()->select( 'COUNT(*)', 'forums_archive_posts', array(
-			array( 'archive_author_id=?', $member->member_id ),
-			array( \IPS\Db::i()->in( 'archive_forum_id', iterator_to_array( \IPS\Db::i()->select( 'id', 'forums_forums', 'inc_postcount=0' ) ), TRUE ) )
-		) )->first();
+		$where = [];
+		$where[] = [ 'archive_author_id=?', $member->member_id ];
+		
+		if ( !$includeNonPostCountIncreasing )
+		{
+			$where[] = [ \IPS\Db::i()->in( 'archive_forum_id', iterator_to_array( \IPS\Db::i()->select( 'id', 'forums_forums', 'inc_postcount=0' ) ) ) ];
+		}
+		if ( !$includeHiddenAndPendingApproval )
+		{
+			$where[] = [ 'archive_queued=0' ];
+		}
+				
+		return \IPS\Db::i()->select( 'COUNT(*)', 'forums_posts', $where )->first();
 	}
 
 	/**