diff --git a/docroot/sites/all/modules/contrib/media/media.info b/docroot/sites/all/modules/contrib/media/media.info
index 369e08b3..dc426f86 100644
--- a/docroot/sites/all/modules/contrib/media/media.info
+++ b/docroot/sites/all/modules/contrib/media/media.info
@@ -24,8 +24,8 @@ configure = admin/config/media/browser
; We have to add a fake version so Git checkouts do not fail Media dependencies
version = 7.x-2.x-dev
-; Information added by Drupal.org packaging script on 2021-04-09
-version = "7.x-2.27"
+; Information added by Drupal.org packaging script on 2022-04-07
+version = "7.x-2.28"
core = "7.x"
project = "media"
-datestamp = "1617993403"
+datestamp = "1649338532"
diff --git a/docroot/sites/all/modules/contrib/media/modules/media_bulk_upload/media_bulk_upload.info b/docroot/sites/all/modules/contrib/media/modules/media_bulk_upload/media_bulk_upload.info
index 617b2cb2..c12cf3f8 100644
--- a/docroot/sites/all/modules/contrib/media/modules/media_bulk_upload/media_bulk_upload.info
+++ b/docroot/sites/all/modules/contrib/media/modules/media_bulk_upload/media_bulk_upload.info
@@ -15,8 +15,8 @@ test_dependencies[] = plupload
files[] = includes/MediaBrowserBulkUpload.inc
files[] = tests/media_bulk_upload.test
-; Information added by Drupal.org packaging script on 2021-04-09
-version = "7.x-2.27"
+; Information added by Drupal.org packaging script on 2022-04-07
+version = "7.x-2.28"
core = "7.x"
project = "media"
-datestamp = "1617993403"
+datestamp = "1649338532"
diff --git a/docroot/sites/all/modules/contrib/media/modules/media_internet/media_internet.info b/docroot/sites/all/modules/contrib/media/modules/media_internet/media_internet.info
index e91656da..bf74c7a5 100644
--- a/docroot/sites/all/modules/contrib/media/modules/media_internet/media_internet.info
+++ b/docroot/sites/all/modules/contrib/media/modules/media_internet/media_internet.info
@@ -12,8 +12,8 @@ files[] = includes/MediaInternetNoHandlerException.inc
files[] = includes/MediaInternetValidationException.inc
files[] = tests/media_internet.test
-; Information added by Drupal.org packaging script on 2021-04-09
-version = "7.x-2.27"
+; Information added by Drupal.org packaging script on 2022-04-07
+version = "7.x-2.28"
core = "7.x"
project = "media"
-datestamp = "1617993403"
+datestamp = "1649338532"
diff --git a/docroot/sites/all/modules/contrib/media/modules/media_internet/tests/media_internet_test.info b/docroot/sites/all/modules/contrib/media/modules/media_internet/tests/media_internet_test.info
index bf57e8a3..2c71f507 100644
--- a/docroot/sites/all/modules/contrib/media/modules/media_internet/tests/media_internet_test.info
+++ b/docroot/sites/all/modules/contrib/media/modules/media_internet/tests/media_internet_test.info
@@ -7,8 +7,8 @@ hidden = TRUE
files[] = includes/MediaInternetTestStreamWrapper.inc
files[] = includes/MediaInternetTestHandler.inc
-; Information added by Drupal.org packaging script on 2021-04-09
-version = "7.x-2.27"
+; Information added by Drupal.org packaging script on 2022-04-07
+version = "7.x-2.28"
core = "7.x"
project = "media"
-datestamp = "1617993403"
+datestamp = "1649338532"
diff --git a/docroot/sites/all/modules/contrib/media/modules/media_migrate_file_types/media_migrate_file_types.info b/docroot/sites/all/modules/contrib/media/modules/media_migrate_file_types/media_migrate_file_types.info
index 024adf97..11be01e9 100644
--- a/docroot/sites/all/modules/contrib/media/modules/media_migrate_file_types/media_migrate_file_types.info
+++ b/docroot/sites/all/modules/contrib/media/modules/media_migrate_file_types/media_migrate_file_types.info
@@ -8,8 +8,8 @@ dependencies[] = media
configure = admin/structure/file-types/upgrade
-; Information added by Drupal.org packaging script on 2021-04-09
-version = "7.x-2.27"
+; Information added by Drupal.org packaging script on 2022-04-07
+version = "7.x-2.28"
core = "7.x"
project = "media"
-datestamp = "1617993403"
+datestamp = "1649338532"
diff --git a/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg/media_wysiwyg.info b/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg/media_wysiwyg.info
index f1a1af20..45c74585 100644
--- a/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg/media_wysiwyg.info
+++ b/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg/media_wysiwyg.info
@@ -16,8 +16,8 @@ files[] = tests/media_wysiwyg.paragraph_fix_filter.test
configure = admin/config/media/browser
-; Information added by Drupal.org packaging script on 2021-04-09
-version = "7.x-2.27"
+; Information added by Drupal.org packaging script on 2022-04-07
+version = "7.x-2.28"
core = "7.x"
project = "media"
-datestamp = "1617993403"
+datestamp = "1649338532"
diff --git a/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg/media_wysiwyg.module b/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg/media_wysiwyg.module
index d27b103c..97fb2dae 100644
--- a/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg/media_wysiwyg.module
+++ b/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg/media_wysiwyg.module
@@ -209,12 +209,14 @@ function media_wysiwyg_form_wysiwyg_profile_form_alter(&$form, &$form_state) {
function media_wysiwyg_wysiwyg_button_element_validate($element, &$form_state) {
if (!empty($element['#value'])) {
$format = filter_format_load($form_state['build_info']['args'][0]->format);
- $filters = filter_list_format($format->format);
- if (empty($filters['media_filter']->status)) {
- form_error($element, t('The Convert Media tags to markup filter must be enabled for the @format format in order to use the Media browser WYSIWYG button.', array(
- '@format-link' => url('admin/config/content/formats/' . $format->format, array('query' => array('destination' => $_GET['q']))),
- '@format' => $format->name,
- )));
+ if (is_object($format)) {
+ $filters = filter_list_format($format->format);
+ if (empty($filters['media_filter']->status)) {
+ form_error($element, t('The Convert Media tags to markup filter must be enabled for the @format format in order to use the Media browser WYSIWYG button.', array(
+ '@format-link' => url('admin/config/content/formats/' . $format->format, array('query' => array('destination' => $_GET['q']))),
+ '@format' => $format->name,
+ )));
+ }
}
}
diff --git a/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg/tests/media_wysiwyg.macro.test b/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg/tests/media_wysiwyg.macro.test
index b3407fe3..8ee26a76 100644
--- a/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg/tests/media_wysiwyg.macro.test
+++ b/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg/tests/media_wysiwyg.macro.test
@@ -16,6 +16,14 @@ abstract class MediaWYSIWYGMacroTestHelper extends MediaWYSIWYGTestHelper {
public function setUp() {
parent::setUp(array('field_ui', 'token'));
+ // Work around a bug in core's token handling.
+ // @todo This is probably not a good idea.
+ // @see https://www.drupal.org/project/metatag/issues/3271006
+ // @see https://www.drupal.org/project/drupal/issues/1173706
+ $instance = field_read_instance('node', 'field_image', 'article');
+ $instance['settings']['file_directory'] = 'field/image';
+ field_update_instance($instance);
+
// Create and log in a user.
$this->admin_user = $this->drupalCreateUser(array(
'administer file types',
@@ -166,6 +174,12 @@ class MediaWYSIWYGWYSIWYGOverridesTest extends MediaWYSIWYGMacroTestHelper {
$instance = field_read_instance('file', 'field_file_image_title_text', 'image');
$instance['display']['preview']['type'] = 'text_default';
$instance['display']['preview']['module'] = 'text';
+ // Work around a bug in core's token handling.
+ // @todo This is probably not a good idea.
+ // @see https://www.drupal.org/project/metatag/issues/3271006
+ // @see https://www.drupal.org/project/metatag/issues/3272112
+ // @see https://www.drupal.org/project/drupal/issues/1173706
+ $instance['settings']['file_directory'] = 'field/image';
field_update_instance($instance);
$files = $this->drupalGetTestFiles('image');
diff --git a/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg/tests/media_wysiwyg.paragraph_fix_filter.test b/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg/tests/media_wysiwyg.paragraph_fix_filter.test
index 610d4f2b..33936b42 100644
--- a/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg/tests/media_wysiwyg.paragraph_fix_filter.test
+++ b/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg/tests/media_wysiwyg.paragraph_fix_filter.test
@@ -47,7 +47,15 @@ class MediaWYSIWYGParagraphFixFilterTest extends MediaWYSIWYGTestHelper {
* Set-up the system for testing without the filter enabled.
*/
public function setUp() {
- parent::setUp('token');
+ parent::setUp(array('token'));
+
+ // Work around a bug in core's token handling.
+ // @todo This is probably not a good idea.
+ // @see https://www.drupal.org/project/metatag/issues/3271006
+ // @see https://www.drupal.org/project/drupal/issues/1173706
+ $instance = field_read_instance('node', 'field_image', 'article');
+ $instance['settings']['file_directory'] = 'field/image';
+ field_update_instance($instance);
// Create and log in a user.
$account = $this->drupalCreateUser(array(
diff --git a/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg_settings/media_wysiwyg_settings.info b/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg_settings/media_wysiwyg_settings.info
index 82a1fb4c..9b106f27 100644
--- a/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg_settings/media_wysiwyg_settings.info
+++ b/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg_settings/media_wysiwyg_settings.info
@@ -13,8 +13,8 @@ features[filter][] = full_html
features[wysiwyg][] = filtered_html
features[wysiwyg][] = full_html
-; Information added by Drupal.org packaging script on 2021-04-09
-version = "7.x-2.27"
+; Information added by Drupal.org packaging script on 2022-04-07
+version = "7.x-2.28"
core = "7.x"
project = "media"
-datestamp = "1617993403"
+datestamp = "1649338532"
diff --git a/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.info b/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.info
index 632a9da3..0c55538b 100644
--- a/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.info
+++ b/docroot/sites/all/modules/contrib/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.info
@@ -3,8 +3,8 @@ description = DEPRECATED, this folder is only here so that the module can be uni
package = Media
core = 7.x
-; Information added by Drupal.org packaging script on 2021-04-09
-version = "7.x-2.27"
+; Information added by Drupal.org packaging script on 2022-04-07
+version = "7.x-2.28"
core = "7.x"
project = "media"
-datestamp = "1617993403"
+datestamp = "1649338532"
diff --git a/docroot/sites/all/modules/contrib/media/modules/mediafield/mediafield.info b/docroot/sites/all/modules/contrib/media/modules/mediafield/mediafield.info
index 641db678..ff3981b9 100644
--- a/docroot/sites/all/modules/contrib/media/modules/mediafield/mediafield.info
+++ b/docroot/sites/all/modules/contrib/media/modules/mediafield/mediafield.info
@@ -4,8 +4,8 @@ package = Media
core = 7.x
dependencies[] = media
-; Information added by Drupal.org packaging script on 2021-04-09
-version = "7.x-2.27"
+; Information added by Drupal.org packaging script on 2022-04-07
+version = "7.x-2.28"
core = "7.x"
project = "media"
-datestamp = "1617993403"
+datestamp = "1649338532"
diff --git a/docroot/sites/all/modules/contrib/media/tests/media.test b/docroot/sites/all/modules/contrib/media/tests/media.test
index 1e822ea5..fdb91511 100644
--- a/docroot/sites/all/modules/contrib/media/tests/media.test
+++ b/docroot/sites/all/modules/contrib/media/tests/media.test
@@ -996,7 +996,7 @@ class MediaElementSettingsTestCase extends MediaFileFieldTestCase {
'schemes' => array(
'public' => 'public',
),
- 'file_directory' => '',
+ 'file_directory' => '[date:custom:Y]-[date:custom:m]',
'file_extensions' => 'txt',
'max_filesize' => '',
'uri_scheme' => 'public',
diff --git a/docroot/sites/all/modules/contrib/media/tests/media_module_test.info b/docroot/sites/all/modules/contrib/media/tests/media_module_test.info
index ecbd16e3..34d76ad8 100644
--- a/docroot/sites/all/modules/contrib/media/tests/media_module_test.info
+++ b/docroot/sites/all/modules/contrib/media/tests/media_module_test.info
@@ -6,8 +6,8 @@ hidden = TRUE
files[] = includes/MediaModuleTest.inc
-; Information added by Drupal.org packaging script on 2021-04-09
-version = "7.x-2.27"
+; Information added by Drupal.org packaging script on 2022-04-07
+version = "7.x-2.28"
core = "7.x"
project = "media"
-datestamp = "1617993403"
+datestamp = "1649338532"