diff --git a/includes/MediaYouTubeBrowser.inc b/includes/MediaYouTubeBrowser.inc index af9ebc8..e7182ba 100644 --- a/includes/MediaYouTubeBrowser.inc +++ b/includes/MediaYouTubeBrowser.inc @@ -14,19 +14,16 @@ class MediaYouTubeBrowser extends MediaBrowserPlugin { * Implements MediaBrowserPluginInterface::access(). */ public function access($account = NULL) { - // @TODO: media_access() is a wrapper for file_entity_access(). Switch to the - // new function when Media 1.x is deprecated. - return media_access('create', $account); + // @TODO: Replace with media_internet_access($account) when Media 1.x is + // deprecated, since that function only exists in Media 2.x. + return user_access('administer files', $account) || user_access('add media from remote sources', $account); } /** * Implements MediaBrowserPlugin::view(). */ public function view() { - // Check if the user is able to add remote media. - if (user_access('add media from remote sources')) { - $build['form'] = drupal_get_form('media_youtube_add', $this->params['types'], $this->params['multiselect']); - return $build; - } + $build['form'] = drupal_get_form('media_youtube_add', $this->params['types'], $this->params['multiselect']); + return $build; } } diff --git a/media_youtube.install b/media_youtube.install index 9da8438..cadda3a 100644 --- a/media_youtube.install +++ b/media_youtube.install @@ -172,3 +172,13 @@ function media_youtube_update_7202() { // Update existing files db_query("UPDATE {file_managed} SET type = 'video' WHERE type = 'undefined' AND filemime = 'video/youtube'"); } + +/** + * Update the Media YouTube browser's access check. + * + * Check your permissions; after this update the Media YouTube browser will be + * available to users with the "administer files" or "add media from remote + * sources" permissions only. + */ +function media_youtube_update_7203() { +}