Version 4.7.8
This commit is contained in:
1 parent
7b7404e741
commit
fd22d99e69
688 files changed
+19814
-10890
No files matched your search
@@ -266,7 +266,25 @@ class _topic extends \IPS\Content\Controller
|
||||
}
|
||||
}
|
||||
$pagination = ( $topic->commentPageCount() > 1 ) ? $topic->commentPagination( array( 'sortby' ) ) : NULL;
|
||||
}
|
||||
}
|
||||
|
||||
if ( isset( \IPS\Request::i()->ltqid ) and $liveTopic = $topic->getLiveTopic() )
|
||||
{
|
||||
try
|
||||
{
|
||||
$question = \IPS\cloud\LiveTopic\Question::load( \IPS\Request::i()->ltqid );
|
||||
|
||||
if ( is_string( $where ) )
|
||||
{
|
||||
$_where[] = $where;
|
||||
$where = $_where;
|
||||
}
|
||||
|
||||
$where[] = array( 'pid=? OR pid IN(?)', $question->post_id, \IPS\Db::i()->select( 'post_id', 'cloud_livetopics_answer', [ 'question_id=?', $question->id ] ) );
|
||||
}
|
||||
catch( \OutOfRangeException ) { }
|
||||
}
|
||||
|
||||
$comments = $topic->comments( NULL, $offset, $order, $orderDirection, NULL, NULL, NULL, $where, FALSE, ( isset( \IPS\Request::i()->showDeleted ) ) );
|
||||
$current = current( $comments );
|
||||
reset( $comments );
|
||||
@@ -341,6 +359,16 @@ class _topic extends \IPS\Content\Controller
|
||||
\IPS\Output::i()->sidebar['contextual'] = \IPS\Theme::i()->getTemplate( 'topics' )->activity( $topic, 'sidebar' );
|
||||
}
|
||||
|
||||
if ( $liveTopic = $topic->getLiveTopic() )
|
||||
{
|
||||
if ( ! isset( \IPS\Output::i()->sidebar['contextual'] ) )
|
||||
{
|
||||
\IPS\Output::i()->sidebar['contextual'] = '';
|
||||
}
|
||||
|
||||
\IPS\Output::i()->sidebar['contextual'] .= \IPS\Theme::i()->getTemplate( 'livetopics', 'cloud' )->liveTopicSidebar( $liveTopic );
|
||||
}
|
||||
|
||||
/* Add Json-LD */
|
||||
$isQuestion = ( $topic->isQuestion() or $topic->isSolved() );
|
||||
|
||||
|
||||
Reference in new issue
Block a user