Skip to content
This repository was archived by the owner on Aug 14, 2023. It is now read-only.

Commit c8c923b

Browse files
cablemancableman
committed
Merge branch 'master' into development
2 parents 98cd2c9 + debbe42 commit c8c923b

File tree

127 files changed

+2139
-567
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+2139
-567
lines changed

‎sites/all/modules/contrib/commons/.drush-lock-update‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Locked via drush.

‎sites/all/modules/contrib/commons/commons_utility_links/commons_utility_links.info‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ core = 7.x
55

66
dependencies[] = block
77

8-
; Information added by Drupal.org packaging script on 2017-02-06
9-
version = "7.x-3.42"
8+
; Information added by Drupal.org packaging script on 2017-02-27
9+
version = "7.x-3.43"
1010
core = "7.x"
1111
project = "commons"
12-
datestamp = "1486411089"
12+
datestamp = "1488210216"
1313

‎sites/all/modules/contrib/media/includes/media.fields.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ function media_field_widget_form(&$form, &$form_state, $field, $instance, $langc
134134
elseif (module_exists('translation') && $element['#entity_type'] == 'node' && translation_supported_type($element['#entity']->type)) {
135135
$element['#media_parent_entity_form_langcode'] = $element['#entity']->language;
136136
$element['#media_parent_entity_source_langcode'] = $element['#entity']->language;
137-
} elseif ($element['#entity_type'] == 'field_collection_item' && property_exists($form['#entity'], 'language')) {
137+
} elseif ($element['#entity_type'] == 'field_collection_item' && !empty($form['#entity']) && property_exists($form['#entity'], 'language')) {
138138
$element['#media_parent_entity_form_langcode'] = $form['#entity']->language;
139139
}
140140

‎sites/all/modules/contrib/media/media.info‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ configure = admin/config/media/browser
2424
; We have to add a fake version so Git checkouts do not fail Media dependencies
2525
version = 7.x-2.x-dev
2626

27-
; Information added by Drupal.org packaging script on 2017-02-03
28-
version = "7.x-2.0-rc5"
27+
; Information added by Drupal.org packaging script on 2017-03-05
28+
version = "7.x-2.0-rc12"
2929
core = "7.x"
3030
project = "media"
31-
datestamp = "1486142925"
31+
datestamp = "1488724088"
3232

‎sites/all/modules/contrib/media/media.install‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,12 @@ function media_update_7208() {
869869
// Merge existing type with new ones.
870870
if ($new_type = file_type_load($type->name)) {
871871
$new_type->mimetypes = array_merge($type->mimetypes, $new_type->mimetypes);
872-
$new_type->streams = array_merge($type->streams, $new_type->streams);
872+
if (!empty($new_type->streams)) {
873+
$new_type->streams = array_merge($type->streams, $new_type->streams);
874+
}
875+
else{
876+
$new_type->streams = $type->streams;
877+
}
873878
}
874879
else {
875880
$new_type = $type;

‎sites/all/modules/contrib/media/media.module‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -828,11 +828,16 @@ function media_element_process($element, &$form_state, $form) {
828828
// Media browser attach code.
829829
$element['#attached']['js'][] = drupal_get_path('module', 'media') . '/js/media.js';
830830

831+
// IDs of form elements are 'unstable' in Drupal because of drupal_html_id
832+
// add a class for our Javascript instead.
833+
$element_js_class = drupal_html_class('js-media-element-' . $element['#id']);
834+
$element['upload']['#attributes']['class'][] = $element_js_class;
835+
831836
// Add the media options to the page as JavaScript settings.
832837
$element['browse_button']['#attached']['js'] = array(
833838
array(
834839
'type' => 'setting',
835-
'data' => array('media' => array('elements' => array('#' . $element['#id'] => $element['#media_options'])))
840+
'data' => array('media' => array('elements' => array('.' . $element_js_class => $element['#media_options'])))
836841
)
837842
);
838843

‎sites/all/modules/contrib/media/media.views.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function media_views_plugins() {
1919
if (module_exists('search_api')) {
2020
// If the Search API module exists, also allow indices of the file-entity
2121
// that has the fid field indexed.
22-
$indices = search_api_index_load_multiple(NULL);
22+
$indices = search_api_index_load_multiple(FALSE);
2323
foreach ($indices as $machine_name => $index) {
2424
if ($index->item_type == 'file' && isset($index->options['fields']['fid'])) {
2525
$base[] = 'search_api_index_' . $machine_name;

‎sites/all/modules/contrib/media/modules/media_bulk_upload/media_bulk_upload.info‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ test_dependencies[] = plupload
1515
files[] = includes/MediaBrowserBulkUpload.inc
1616
files[] = tests/media_bulk_upload.test
1717

18-
; Information added by Drupal.org packaging script on 2017-02-03
19-
version = "7.x-2.0-rc5"
18+
; Information added by Drupal.org packaging script on 2017-03-05
19+
version = "7.x-2.0-rc12"
2020
core = "7.x"
2121
project = "media"
22-
datestamp = "1486142925"
22+
datestamp = "1488724088"
2323

‎sites/all/modules/contrib/media/modules/media_internet/media_internet.info‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ files[] = includes/MediaInternetNoHandlerException.inc
1212
files[] = includes/MediaInternetValidationException.inc
1313
files[] = tests/media_internet.test
1414

15-
; Information added by Drupal.org packaging script on 2017-02-03
16-
version = "7.x-2.0-rc5"
15+
; Information added by Drupal.org packaging script on 2017-03-05
16+
version = "7.x-2.0-rc12"
1717
core = "7.x"
1818
project = "media"
19-
datestamp = "1486142925"
19+
datestamp = "1488724088"
2020

‎sites/all/modules/contrib/media/modules/media_internet/tests/media_internet_test.info‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ hidden = TRUE
77
files[] = includes/MediaInternetTestStreamWrapper.inc
88
files[] = includes/MediaInternetTestHandler.inc
99

10-
; Information added by Drupal.org packaging script on 2017-02-03
11-
version = "7.x-2.0-rc5"
10+
; Information added by Drupal.org packaging script on 2017-03-05
11+
version = "7.x-2.0-rc12"
1212
core = "7.x"
1313
project = "media"
14-
datestamp = "1486142925"
14+
datestamp = "1488724088"
1515

0 commit comments

Comments
 (0)