Skip to content

Commit

Permalink
Merge pull request #4473 from NateWr/i4340_dao
Browse files Browse the repository at this point in the history
#4340 Fix fatal error from missing DAO method
  • Loading branch information
asmecher authored Feb 11, 2019
2 parents d539294 + f0c8cbb commit f8d959b
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions classes/context/ContextDAO.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ function getAvailable($userId = null, $rangeInfo = null) {
'SELECT c.* FROM ' . $this->tableName . ' c
WHERE ' .
($userId?
'c.' . $this->_getPrimaryKeyColumn() . ' IN (SELECT DISTINCT ug.context_id FROM user_groups ug JOIN user_user_groups uug ON (ug.user_group_id = uug.user_group_id) WHERE uug.user_id = ?)
'c.' . $this->primaryKeyColumn . ' IN (SELECT DISTINCT ug.context_id FROM user_groups ug JOIN user_user_groups uug ON (ug.user_group_id = uug.user_group_id) WHERE uug.user_id = ?)
OR ? IN (SELECT user_id FROM user_groups ug JOIN user_user_groups uug ON (ug.user_group_id = uug.user_group_id) WHERE ug.role_id = ?)'
:'c.enabled = 1') .
' ORDER BY seq',
Expand Down Expand Up @@ -193,5 +193,3 @@ function resequence() {
$result->Close();
}
}


0 comments on commit f8d959b

Please sign in to comment.