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
@@ -583,7 +583,7 @@ class settings extends Controller
|
||||
|
||||
if ( SettingsClass::i()->archive_on )
|
||||
{
|
||||
$whereClause = Db::i()->compileWhereClause( Application::load('forums')->archiveWhere( Db::i()->select( '*', 'forums_archive_rules' ) ) );
|
||||
$whereClause = Db::i()->compileWhereClause( Application::load('forums')->archiveWhere( iterator_to_array( Db::i()->select( '*', 'forums_archive_rules' ) ) ) );
|
||||
$_whereClause = array( 'topic_archive_status=? AND !( ' . $whereClause['clause'] . ')' );
|
||||
$_whereClause[] = Topic::ARCHIVE_DONE;
|
||||
foreach ( $whereClause['binds'] as $bind )
|
||||
|
||||
@@ -353,7 +353,7 @@ class forums extends Controller
|
||||
/* Assignments */
|
||||
if( $forum->forums_bitoptions['bw_enable_assignments'] AND Bridge::i()->featureIsEnabled( 'assignments' ) )
|
||||
{
|
||||
if( Topic::modPermission( 'assign', null, $forum ) or $teams = Member::loggedIn()->teams() or Member::loggedIn()->totalAssignments() )
|
||||
if( Topic::modPermission( 'assign', null, $forum ) or $teams = Member::loggedIn()->teams() or ( Member::loggedIn()->modPermissions() and Member::loggedIn()->totalAssignments() ) )
|
||||
{
|
||||
$table->filters['filter_assigned_topics'] = 'assignment_id>0';
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user