Index: api/classes/CUser.php =================================================================== --- api/classes/CUser.php (revision 27678) +++ api/classes/CUser.php (working copy) @@ -335,6 +335,23 @@ } } + // adding mediatypeids + if (!is_null($options['selectMediatypes']) && str_in_array($options['selectMediatypes'], $subselectsAllowedOutputs)) { + $objParams = array( + 'output' => $options['selectMediatypes'], + 'userids' => $userids, + 'preservekeys' => true + ); + $userMediatypes = API::Mediatype()->get($objParams); + foreach ($userMediatypes as $userMediatype) { + $utypes = $userMediatype['users']; + unset($userMediatype['users']); + foreach ($utypes as $user) { + $result[$user['userid']]['mediatypes'][] = $userMediatype; + } + } + } + // removing keys (hash -> array) if (is_null($options['preservekeys'])) { $result = zbx_cleanHashes($result); Index: api/classes/CMediatype.php =================================================================== --- api/classes/CMediatype.php (revision 27678) +++ api/classes/CMediatype.php (working copy) @@ -123,7 +123,7 @@ if ($options['output'] != API_OUTPUT_SHORTEN) { $sqlParts['select']['mediaid'] = 'm.mediaid'; } - $sqlParts['from']['medias'] = 'medias m'; + $sqlParts['from']['medias'] = 'media m'; $sqlParts['where'][] = DBcondition('m.mediaid', $options['mediaids']); $sqlParts['where']['mmt'] = 'm.mediatypeid=mt.mediatypeid'; @@ -139,7 +139,7 @@ if ($options['output'] != API_OUTPUT_SHORTEN) { $sqlParts['select']['userid'] = 'm.userid'; } - $sqlParts['from']['medias'] = 'medias m'; + $sqlParts['from']['medias'] = 'media m'; $sqlParts['where'][] = DBcondition('m.userid', $options['userids']); $sqlParts['where']['mmt'] = 'm.mediatypeid=mt.mediatypeid';