Skip to content

Commit f8d959b

Browse files
authored
Merge pull request #4473 from NateWr/i4340_dao
#4340 Fix fatal error from missing DAO method
2 parents d539294 + f0c8cbb commit f8d959b

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

classes/context/ContextDAO.inc.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ function getAvailable($userId = null, $rangeInfo = null) {
127127
'SELECT c.* FROM ' . $this->tableName . ' c
128128
WHERE ' .
129129
($userId?
130-
'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 = ?)
130+
'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 = ?)
131131
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 = ?)'
132132
:'c.enabled = 1') .
133133
' ORDER BY seq',
@@ -193,5 +193,3 @@ function resequence() {
193193
$result->Close();
194194
}
195195
}
196-
197-

0 commit comments

Comments
 (0)