Version 4.7.13
This commit is contained in:
1 parent
fd22d99e69
commit
7124a02564
954 files changed
+29277
-59308
No files matched your search
@@ -28,7 +28,6 @@ class _Topic extends \IPS\Content\Item implements
|
||||
\IPS\Content\Followable,
|
||||
\IPS\Content\Shareable,
|
||||
\IPS\Content\ReadMarkers,
|
||||
\IPS\Content\Views,
|
||||
\IPS\Content\Polls, \SplObserver,
|
||||
\IPS\Content\Ratings,
|
||||
\IPS\Content\Searchable,
|
||||
@@ -37,7 +36,7 @@ class _Topic extends \IPS\Content\Item implements
|
||||
\IPS\Content\Anonymous,
|
||||
\IPS\Content\FuturePublishing
|
||||
{
|
||||
use \IPS\forums\Topic\LiveTopic, \IPS\Content\Reactable, \IPS\Content\Reportable, \IPS\Content\Statistics, \IPS\Content\Solvable { toggleSolveComment as protected _toggleSolveComment; }
|
||||
use \IPS\forums\Topic\LiveTopic, \IPS\Content\Reactable, \IPS\Content\Reportable, \IPS\Content\Statistics, \IPS\Content\ViewUpdates, \IPS\Content\Solvable { toggleSolveComment as protected _toggleSolveComment; }
|
||||
|
||||
/**
|
||||
* @brief Not archived
|
||||
@@ -1302,7 +1301,13 @@ class _Topic extends \IPS\Content\Item implements
|
||||
{
|
||||
if ( $container and $container->tag_predefined )
|
||||
{
|
||||
return explode( ',', $container->tag_predefined );
|
||||
$return = explode( ',', $container->tag_predefined );
|
||||
if ( \IPS\Settings::i()->tags_alphabetical )
|
||||
{
|
||||
natcasesort( $return );
|
||||
}
|
||||
|
||||
return $return;
|
||||
}
|
||||
|
||||
return parent::definedTags( $container );
|
||||
@@ -2295,6 +2300,11 @@ class _Topic extends \IPS\Content\Item implements
|
||||
*/
|
||||
public function showSummaryOnDesktop()
|
||||
{
|
||||
/* Hide the summary for future topics */
|
||||
if ( $this->isFutureDate() )
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
if ( ! \IPS\Settings::i()->forums_topics_activity_pages_show OR ( (int) \IPS\Settings::i()->forums_topics_activity_pages_show <= (int) $this->commentPageCount() ) )
|
||||
{
|
||||
$viewSettings = json_decode( \IPS\Settings::i()->forums_topic_activity, TRUE );
|
||||
@@ -2314,6 +2324,11 @@ class _Topic extends \IPS\Content\Item implements
|
||||
*/
|
||||
public function showSummaryOnMobile()
|
||||
{
|
||||
/* Hide the summary for future topics */
|
||||
if ( $this->isFutureDate() )
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
if ( ! \IPS\Settings::i()->forums_topics_activity_pages_show OR ( (int) \IPS\Settings::i()->forums_topics_activity_pages_show <= (int) $this->commentPageCount() ) )
|
||||
{
|
||||
$viewSettings = json_decode( \IPS\Settings::i()->forums_topic_activity, TRUE );
|
||||
|
||||
Reference in new issue
Block a user