Version 5.0.13
This commit is contained in:
1 parent
b89858b2ff
commit
5efe744c5f
1407 files changed
+69690
-30177
No files matched your search
@@ -402,15 +402,17 @@ class streams extends Controller
|
||||
unset( $tmp );
|
||||
}
|
||||
|
||||
if ( isset( Request::i()->latest ) )
|
||||
if ( isset( Request::i()->latest ) and is_numeric( Request::i()->latest ) )
|
||||
{
|
||||
$latest = (int) Request::i()->latest;
|
||||
|
||||
if ( $stream->id and !$stream->include_comments )
|
||||
{
|
||||
$query->filterByLastUpdatedDate( DateTime::ts( Request::i()->latest ) );
|
||||
$query->filterByLastUpdatedDate( DateTime::ts( $latest ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
$query->filterByCreateDate( DateTime::ts( Request::i()->latest ) );
|
||||
$query->filterByCreateDate( DateTime::ts( $latest) );
|
||||
}
|
||||
|
||||
$query->setLimit(350);
|
||||
@@ -687,7 +689,14 @@ class streams extends Controller
|
||||
{
|
||||
$url = $stream ? $stream->baseUrl->setQueryString( 'className', $class ) : Request::i()->url()->setQueryString( 'className', $class );
|
||||
$containerClass = $class::$containerNodeClass;
|
||||
$field = new Node( 'stream_containers_' . $class::$title, $currentContainers[$class] ?? array(), NULL, array( 'url' => $url, 'class' => $class::$containerNodeClass, 'multiple' => TRUE, 'permissionCheck' => $containerClass::searchableNodesPermission(), 'clubs' => ( Settings::i()->clubs AND IPS::classUsesTrait( $containerClass, 'IPS\Content\ClubContainer' ) ) ), NULL, NULL, NULL, 'stream_containers_' . $class::$title );
|
||||
$field = new Node( 'stream_containers_' . $class::$title, $currentContainers[$class] ?? array(), NULL, array(
|
||||
'url' => $url,
|
||||
'class' => $class::$containerNodeClass,
|
||||
'multiple' => TRUE,
|
||||
'permissionCheck' => $containerClass::searchableNodesPermission(),
|
||||
'clubs' => ( Settings::i()->clubs AND IPS::classUsesTrait( $containerClass, 'IPS\Content\ClubContainer' ) ),
|
||||
'nodeGroups' => TRUE,
|
||||
), NULL, NULL, NULL, 'stream_containers_' . $class::$title );
|
||||
$field->label = Member::loggedIn()->language()->addToStack( 'stream_narrow_by_container_label', FALSE, array( 'sprintf' => array( Member::loggedIn()->language()->addToStack( $containerClass::$nodeTitle ) ) ) );
|
||||
|
||||
return Output::i()->json( array( 'node' => Theme::i()->getTemplate('streams')->filterFormContentTypeContent( $field, $class, Request::i()->key ) ) );
|
||||
|
||||
Reference in new issue
Block a user