Version 5.0.0 release
This commit is contained in:
1 parent
90e8c7e903
commit
a3a4a9ccbd
651 files changed
+7275
-9481
No files matched your search
@@ -258,20 +258,15 @@ class category extends Controller
|
||||
/* Does the category have a custom layout? */
|
||||
if( $category->template_listing == 0 )
|
||||
{
|
||||
$table->extra = [ 'layout' => $database->display_settings['listing']['layout'] ];
|
||||
$layout = $database->display_settings['listing']['layout'];
|
||||
}
|
||||
else
|
||||
elseif( $displaySettings = $category->display_settings )
|
||||
{
|
||||
if( $displaySettings = $category->display_settings )
|
||||
{
|
||||
$table->extra = [ 'layout' => $displaySettings['layout'] ];
|
||||
}
|
||||
else
|
||||
{
|
||||
$table->extra = [ 'layout' => 'table' ];
|
||||
}
|
||||
$layout = $displaySettings['layout'];
|
||||
}
|
||||
|
||||
$table->extra = [ 'layout' => $layout ?? 'table', 'db' => $database ];
|
||||
|
||||
$table->hover = TRUE;
|
||||
$table->sortBy = ( isset( Request::i()->sortby ) ) ? Request::i()->sortby : ( $database->field_sort ? $recordsClass::$databaseTable . '.' . $recordsClass::$databasePrefix . $database->field_sort : 'record_last_comment' );
|
||||
$table->sortDirection = ( isset( Request::i()->sortdirection ) ) ? Request::i()->sortdirection : ( $database->field_direction ? $database->field_direction : 'desc' );
|
||||
@@ -281,7 +276,6 @@ class category extends Controller
|
||||
$table->defaultSortDirection = $database->field_direction;
|
||||
}
|
||||
$table->limit = $database->field_perpage ? $database->field_perpage : 25;
|
||||
$table->title = Member::loggedIn()->language()->addToStack( $database->use_categories ? 'x_records_in_this_category' : 'x_records' , FALSE, array( 'sprintf' => array( $category->_items, $database->recordWord( $category->_items ) ) ) );
|
||||
|
||||
/* Set up sort fields to allow sorting numerically or by date */
|
||||
$sortFields = $customFields;
|
||||
|
||||
Reference in new issue
Block a user