Version 4.3.6
This commit is contained in:
1 parent
fe1acf984a
commit
1a0c7fd3c2
609 files changed
+14707
-5726
No files matched your search
@@ -470,9 +470,18 @@ class _search extends \IPS\Dispatcher\Controller
|
||||
{
|
||||
$beforeKey = "{$k}_before";
|
||||
$afterKey = "{$k}_after";
|
||||
if ( isset( \IPS\Request::i()->$beforeKey ) or isset( \IPS\Request::i()->$afterKey ) )
|
||||
|
||||
if ( isset( \IPS\Request::i()->$beforeKey ) and \IPS\Request::i()->$beforeKey != 'any' and isset( \IPS\Request::i()->$afterKey ) and \IPS\Request::i()->$afterKey != 'any' )
|
||||
{
|
||||
foreach ( array( 'before', 'after' ) as $l )
|
||||
$after = \IPS\DateTime::ts( \IPS\Request::i()->$afterKey );
|
||||
$before = \IPS\DateTime::ts( \IPS\Request::i()->$beforeKey );
|
||||
$titleConditions[] = \IPS\Member::loggedIn()->language()->addToStack( "search_blurb_date_$k", FALSE, array( 'sprintf' => array( \IPS\Member::loggedIn()->language()->addToStack( "search_blurb_date_between", FALSE, array( 'sprintf' => array( $after->localeDate(), $before->localeDate() ) ) ) ) ) );
|
||||
|
||||
$query->$method( $after, $before );
|
||||
}
|
||||
elseif ( isset( \IPS\Request::i()->$beforeKey ) or isset( \IPS\Request::i()->$afterKey ) )
|
||||
{
|
||||
foreach ( array( 'after', 'before' ) as $l )
|
||||
{
|
||||
$$l = NULL;
|
||||
$key = "{$l}Key";
|
||||
@@ -660,7 +669,7 @@ class _search extends \IPS\Dispatcher\Controller
|
||||
|
||||
\IPS\Output::i()->httpHeaders += $httpHeaders;
|
||||
|
||||
\IPS\Output::i()->title = \IPS\Member::loggedIn()->language()->addToStack('search_results_title');
|
||||
\IPS\Output::i()->title = $title;
|
||||
\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'search' )->search( $this->_splitTermsForDisplay(), $title, $results, $pagination, $baseUrl, $types, $this->_form()->customTemplate( array( \IPS\Theme::i()->getTemplate( 'search' ), 'filters' ), $baseUrl, $count ), $count );
|
||||
}
|
||||
}
|
||||
@@ -1104,12 +1113,13 @@ class _search extends \IPS\Dispatcher\Controller
|
||||
/**
|
||||
* Get the different content type extensions
|
||||
*
|
||||
* @param bool|\IPS\Member $member Check member access
|
||||
* @return array
|
||||
*/
|
||||
public static function contentTypes()
|
||||
public static function contentTypes( $member = TRUE )
|
||||
{
|
||||
$types = array();
|
||||
foreach ( \IPS\Content::routedClasses( TRUE, FALSE, TRUE ) as $class )
|
||||
foreach ( \IPS\Content::routedClasses( $member, FALSE, TRUE ) as $class )
|
||||
{
|
||||
if( is_subclass_of( $class, 'IPS\Content\Searchable' ) and $class::includeInSiteSearch() )
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user