Projet

Général

Profil

Révision 3115e37e

Ajouté par Assos Assos il y a plus de 5 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/i18n/i18n.info
8 8
files[] = i18n.test
9 9
configure = admin/config/regional/i18n
10 10

  
11
; Information added by Drupal.org packaging script on 2018-07-11
12
version = "7.x-1.25"
11
; Information added by Drupal.org packaging script on 2018-08-17
12
version = "7.x-1.26"
13 13
core = "7.x"
14 14
project = "i18n"
15
datestamp = "1531342125"
15
datestamp = "1534531985"
drupal7/sites/all/modules/i18n/i18n_block/i18n_block.info
8 8
files[] = i18n_block.test
9 9

  
10 10

  
11
; Information added by Drupal.org packaging script on 2018-07-11
12
version = "7.x-1.25"
11
; Information added by Drupal.org packaging script on 2018-08-17
12
version = "7.x-1.26"
13 13
core = "7.x"
14 14
project = "i18n"
15
datestamp = "1531342125"
15
datestamp = "1534531985"
drupal7/sites/all/modules/i18n/i18n_contact/i18n_contact.info
5 5
package = Multilingual - Internationalization
6 6
core = 7.x
7 7

  
8
; Information added by Drupal.org packaging script on 2018-07-11
9
version = "7.x-1.25"
8
; Information added by Drupal.org packaging script on 2018-08-17
9
version = "7.x-1.26"
10 10
core = "7.x"
11 11
project = "i18n"
12
datestamp = "1531342125"
12
datestamp = "1534531985"
drupal7/sites/all/modules/i18n/i18n_field/i18n_field.info
6 6
core = 7.x
7 7
files[] = i18n_field.inc
8 8
files[] = i18n_field.test
9
; Information added by Drupal.org packaging script on 2018-07-11
10
version = "7.x-1.25"
9
; Information added by Drupal.org packaging script on 2018-08-17
10
version = "7.x-1.26"
11 11
core = "7.x"
12 12
project = "i18n"
13
datestamp = "1531342125"
13
datestamp = "1534531985"
drupal7/sites/all/modules/i18n/i18n_field/i18n_field.module
463 463
  }
464 464
}
465 465

  
466
/**
467
 * Prime the cache to avoid single db queries for entity fields / properties.
468
 *
469
 * This is mainly uses when large operations are occuring like a flush of the
470
 * entity_property_infos().
471
 */
472
function i18n_field_prime_caches() {
473
  global $language;
474
  static $cache_primed;
475

  
476
  // Fill the cache. This should avoid single db queries when filling the
477
  // properties.
478
  if (empty($cache_primed)) {
479
    $cache_primed = TRUE;
480
    $text_group = i18n_string_textgroup('field');
481
    // Load all strings at once to avoid callbacks for each individual string.
482
    $text_group->load_strings();
483
    $text_group->multiple_translation_search(array('type' => '*', 'objectid' => '*', 'property' => '*'), $language->language);
484
  }
485
}
486

  
466 487
/**
467 488
 * Callback to translate entity property info for a fields.
468 489
 *
......
485 506
    return;
486 507
  }
487 508

  
509
  i18n_field_prime_caches();
488 510
  $name = $field['field_name'];
489 511
  $property = &$info[$entity_type]['bundles'][$instance['bundle']]['properties'][$name];
490 512
  $property['label'] = i18n_field_translate_property($instance, 'label', $language->language);
......
498 520
    if ($info = drupal_static('i18n_object_info')) {
499 521
      // Clean static and permanent cache of the data and then re-run the property
500 522
      // building.
501
      drupal_static_reset('entity_get_property_info');
502
      cache_clear_all('entity_property_info:' . $GLOBALS['language']->language, 'cache');
503
      entity_get_property_info();
523
      // Use a lock to avoid stampeding.
524
      $lock_name = 'i18n_field_entity_property_callback_fallback:' . $GLOBALS['language']->language;
525
      // See if another request is already doing this. If so we bail out here as
526
      // we won't help with anything at the moment.
527
      if (!lock_may_be_available($lock_name)) {
528
        return;
529
      }
530
      if (lock_acquire($lock_name)) {
531
        i18n_field_prime_caches();
532
        // Inject translated properties.
533
        $entity_property_info = entity_get_property_info();
534
        foreach ($entity_property_info as $entity_type => $properties) {
535
          if (isset($properties['bundles'])) {
536
            foreach ($properties['bundles'] as $bundle => $bundle_properties) {
537
              if ($bundle_properties['properties']) {
538
                foreach ($bundle_properties['properties'] as $bundle_property => $bundle_property_info) {
539
                  if ($instance = field_info_instance($entity_type, $bundle_property, $bundle)) {
540
                    $property = &$entity_property_info[$entity_type]['bundles'][$instance['bundle']]['properties'][$bundle_property];
541
                    $property['label'] = i18n_field_translate_property($instance, 'label', $GLOBALS['language']->language);
542
                  }
543
                }
544
              }
545
            }
546
          }
547
        }
548
        // Inject into static cache.
549
        $entity_get_property_info = &drupal_static('entity_get_property_info', array());
550
        $entity_get_property_info = $entity_property_info;
551
        // Write permanent cache.
552
        cache_set('entity_property_info:' . $GLOBALS['language']->language, $entity_property_info);
553
        lock_release($lock_name);
554
      }
504 555
    }
505 556
    else {
506 557
      watchdog('i18n_field', 'Unable to run fall-back handling for entity property translation due missing "i18n_object_info" cache', array(), WATCHDOG_WARNING);
drupal7/sites/all/modules/i18n/i18n_forum/i18n_forum.info
7 7
core = 7.x
8 8
files[] = i18n_forum.test
9 9

  
10
; Information added by Drupal.org packaging script on 2018-07-11
11
version = "7.x-1.25"
10
; Information added by Drupal.org packaging script on 2018-08-17
11
version = "7.x-1.26"
12 12
core = "7.x"
13 13
project = "i18n"
14
datestamp = "1531342125"
14
datestamp = "1534531985"
drupal7/sites/all/modules/i18n/i18n_menu/i18n_menu.info
10 10
files[] = i18n_menu.inc
11 11
files[] = i18n_menu.test
12 12

  
13
; Information added by Drupal.org packaging script on 2018-07-11
14
version = "7.x-1.25"
13
; Information added by Drupal.org packaging script on 2018-08-17
14
version = "7.x-1.26"
15 15
core = "7.x"
16 16
project = "i18n"
17
datestamp = "1531342125"
17
datestamp = "1534531985"
drupal7/sites/all/modules/i18n/i18n_node/i18n_node.info
9 9
files[]=i18n_node.test
10 10
files[]=i18n_node.variable.inc
11 11

  
12
; Information added by Drupal.org packaging script on 2018-07-11
13
version = "7.x-1.25"
12
; Information added by Drupal.org packaging script on 2018-08-17
13
version = "7.x-1.26"
14 14
core = "7.x"
15 15
project = "i18n"
16
datestamp = "1531342125"
16
datestamp = "1534531985"
drupal7/sites/all/modules/i18n/i18n_path/i18n_path.info
6 6

  
7 7
files[] = i18n_path.inc
8 8
files[] = i18n_path.test
9
; Information added by Drupal.org packaging script on 2018-07-11
10
version = "7.x-1.25"
9
; Information added by Drupal.org packaging script on 2018-08-17
10
version = "7.x-1.26"
11 11
core = "7.x"
12 12
project = "i18n"
13
datestamp = "1531342125"
13
datestamp = "1534531985"
drupal7/sites/all/modules/i18n/i18n_redirect/i18n_redirect.info
4 4
package = Multilingual - Internationalization
5 5
core = 7.x
6 6

  
7
; Information added by Drupal.org packaging script on 2018-07-11
8
version = "7.x-1.25"
7
; Information added by Drupal.org packaging script on 2018-08-17
8
version = "7.x-1.26"
9 9
core = "7.x"
10 10
project = "i18n"
11
datestamp = "1531342125"
11
datestamp = "1534531985"
drupal7/sites/all/modules/i18n/i18n_select/i18n_select.info
6 6
configure = admin/config/regional/i18n/select
7 7
files[] = i18n_select.test
8 8

  
9
; Information added by Drupal.org packaging script on 2018-07-11
10
version = "7.x-1.25"
9
; Information added by Drupal.org packaging script on 2018-08-17
10
version = "7.x-1.26"
11 11
core = "7.x"
12 12
project = "i18n"
13
datestamp = "1531342125"
13
datestamp = "1534531985"
drupal7/sites/all/modules/i18n/i18n_string/i18n_string.inc
1498 1498
      foreach ($context as $key => $value) {
1499 1499
        if ($value != '*') {
1500 1500
          $try = array_merge($context, array($key => '*'));
1501
          return $this->multiple_cache_get($try);
1501
          $cached_results = $this->multiple_cache_get($try);
1502
          // Now filter the ones that actually match.
1503
          if (!empty($cached_results)) {
1504
            $cached_results = $this->string_filter($cached_results, $context);
1505
          }
1506
          return $cached_results;
1502 1507
        }
1503 1508
      }
1504 1509
    }
drupal7/sites/all/modules/i18n/i18n_string/i18n_string.info
10 10
files[] = i18n_string.test
11 11
configure = admin/config/regional/i18n/strings
12 12

  
13
; Information added by Drupal.org packaging script on 2018-07-11
14
version = "7.x-1.25"
13
; Information added by Drupal.org packaging script on 2018-08-17
14
version = "7.x-1.26"
15 15
core = "7.x"
16 16
project = "i18n"
17
datestamp = "1531342125"
17
datestamp = "1534531985"
drupal7/sites/all/modules/i18n/i18n_sync/i18n_sync.info
10 10
files[] = i18n_sync.module.inc
11 11
files[] = i18n_sync.node.inc
12 12
files[] = i18n_sync.test
13
; Information added by Drupal.org packaging script on 2018-07-11
14
version = "7.x-1.25"
13
; Information added by Drupal.org packaging script on 2018-08-17
14
version = "7.x-1.26"
15 15
core = "7.x"
16 16
project = "i18n"
17
datestamp = "1531342125"
17
datestamp = "1534531985"
drupal7/sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.info
11 11
files[] = i18n_taxonomy.admin.inc
12 12
files[] = i18n_taxonomy.test
13 13

  
14
; Information added by Drupal.org packaging script on 2018-07-11
15
version = "7.x-1.25"
14
; Information added by Drupal.org packaging script on 2018-08-17
15
version = "7.x-1.26"
16 16
core = "7.x"
17 17
project = "i18n"
18
datestamp = "1531342125"
18
datestamp = "1534531985"
drupal7/sites/all/modules/i18n/i18n_translation/i18n_translation.info
6 6

  
7 7
files[] = i18n_translation.inc
8 8

  
9
; Information added by Drupal.org packaging script on 2018-07-11
10
version = "7.x-1.25"
9
; Information added by Drupal.org packaging script on 2018-08-17
10
version = "7.x-1.26"
11 11
core = "7.x"
12 12
project = "i18n"
13
datestamp = "1531342125"
13
datestamp = "1534531985"
drupal7/sites/all/modules/i18n/i18n_user/i18n_user.info
4 4
package = Multilingual - Internationalization
5 5
dependencies[] = i18n_variable
6 6

  
7
; Information added by Drupal.org packaging script on 2018-07-11
8
version = "7.x-1.25"
7
; Information added by Drupal.org packaging script on 2018-08-17
8
version = "7.x-1.26"
9 9
core = "7.x"
10 10
project = "i18n"
11
datestamp = "1531342125"
11
datestamp = "1534531985"
drupal7/sites/all/modules/i18n/i18n_variable/i18n_variable.info
10 10
files[] = i18n_variable.class.inc
11 11
files[] = i18n_variable.test
12 12

  
13
; Information added by Drupal.org packaging script on 2018-07-11
14
version = "7.x-1.25"
13
; Information added by Drupal.org packaging script on 2018-08-17
14
version = "7.x-1.26"
15 15
core = "7.x"
16 16
project = "i18n"
17
datestamp = "1531342125"
17
datestamp = "1534531985"
drupal7/sites/all/modules/i18n/tests/i18n_test.info
7 7
core = 6.x
8 8
hidden = TRUE
9 9

  
10
; Information added by Drupal.org packaging script on 2018-07-11
11
version = "7.x-1.25"
10
; Information added by Drupal.org packaging script on 2018-08-17
11
version = "7.x-1.26"
12 12
core = "7.x"
13 13
project = "i18n"
14
datestamp = "1531342125"
14
datestamp = "1534531985"
drupal7/sites/all/modules/media/includes/media.fields.inc
127 127
  // on the elements for further usage in media_element_process().
128 128
  if (module_invoke('entity_translation', 'enabled', $element['#entity_type'], $element['#entity'])) {
129 129
    $translation_handler = entity_translation_get_handler($element['#entity_type'], $element['#entity']);
130
    $element['#media_parent_entity_form_langcode'] = $translation_handler->getActiveLanguage();
131
    if ($source_langcode = $translation_handler->getSourceLanguage()) {
132
      $element['#media_parent_entity_source_langcode'] = $source_langcode;
130
    if ($translation_handler) {
131
      $element['#media_parent_entity_form_langcode'] = $translation_handler->getActiveLanguage();
132
      if ($source_langcode = $translation_handler->getSourceLanguage()) {
133
        $element['#media_parent_entity_source_langcode'] = $source_langcode;
134
      }
133 135
    }
134 136
  }
135 137
  elseif (module_exists('translation') && $element['#entity_type'] == 'node' && translation_supported_type($element['#entity']->type)) {
drupal7/sites/all/modules/media/media.info
24 24
; We have to add a fake version so Git checkouts do not fail Media dependencies
25 25
version = 7.x-2.x-dev
26 26

  
27
; Information added by Drupal.org packaging script on 2018-04-25
28
version = "7.x-2.19"
27
; Information added by Drupal.org packaging script on 2018-08-17
28
version = "7.x-2.20"
29 29
core = "7.x"
30 30
project = "media"
31
datestamp = "1524677887"
31
datestamp = "1534544300"
drupal7/sites/all/modules/media/media.views.inc
127 127
  $vars['wrapper_suffix'] = '</div>';
128 128
  $vars['list_type_prefix'] = '<' . $handler->options['type'] . ' id="media-browser-library-list" class="' . implode(' ', $class) . '">';
129 129
  $vars['list_type_suffix'] = '</' . $handler->options['type'] . '>';
130
  $vars['aria_role'] = $params['multiselect'] ? 'checkbox' : 'radio';
130
  $vars['aria_role'] = (isset($params['multiselect']) && $params['multiselect']) ? 'checkbox' : 'radio';
131 131

  
132 132
  // Run theming variables through a standard Views preprocess function.
133 133
  template_preprocess_views_view_unformatted($vars);
drupal7/sites/all/modules/media/modules/media_bulk_upload/includes/media_bulk_upload.pages.inc
38 38

  
39 39
    // Remove the 'replace file' functionality.
40 40
    $form['multiform'][$key]['replace_upload']['#access'] = FALSE;
41
    $form['multiform'][$key]['replace_keep_original_filename']['#access'] = FALSE;
41 42

  
42 43
    // Remove any actions.
43 44
    $form['multiform'][$key]['actions']['#access'] = FALSE;
drupal7/sites/all/modules/media/modules/media_bulk_upload/media_bulk_upload.info
15 15
files[] = includes/MediaBrowserBulkUpload.inc
16 16
files[] = tests/media_bulk_upload.test
17 17

  
18
; Information added by Drupal.org packaging script on 2018-04-25
19
version = "7.x-2.19"
18
; Information added by Drupal.org packaging script on 2018-08-17
19
version = "7.x-2.20"
20 20
core = "7.x"
21 21
project = "media"
22
datestamp = "1524677887"
22
datestamp = "1534544300"
drupal7/sites/all/modules/media/modules/media_internet/media_internet.info
12 12
files[] = includes/MediaInternetValidationException.inc
13 13
files[] = tests/media_internet.test
14 14

  
15
; Information added by Drupal.org packaging script on 2018-04-25
16
version = "7.x-2.19"
15
; Information added by Drupal.org packaging script on 2018-08-17
16
version = "7.x-2.20"
17 17
core = "7.x"
18 18
project = "media"
19
datestamp = "1524677887"
19
datestamp = "1534544300"
drupal7/sites/all/modules/media/modules/media_internet/tests/media_internet_test.info
7 7
files[] = includes/MediaInternetTestStreamWrapper.inc
8 8
files[] = includes/MediaInternetTestHandler.inc
9 9

  
10
; Information added by Drupal.org packaging script on 2018-04-25
11
version = "7.x-2.19"
10
; Information added by Drupal.org packaging script on 2018-08-17
11
version = "7.x-2.20"
12 12
core = "7.x"
13 13
project = "media"
14
datestamp = "1524677887"
14
datestamp = "1534544300"
drupal7/sites/all/modules/media/modules/media_migrate_file_types/media_migrate_file_types.info
8 8

  
9 9
configure = admin/structure/file-types/upgrade
10 10

  
11
; Information added by Drupal.org packaging script on 2018-04-25
12
version = "7.x-2.19"
11
; Information added by Drupal.org packaging script on 2018-08-17
12
version = "7.x-2.20"
13 13
core = "7.x"
14 14
project = "media"
15
datestamp = "1524677887"
15
datestamp = "1534544300"
drupal7/sites/all/modules/media/modules/media_wysiwyg/includes/media_wysiwyg.filter.inc
5 5
 * Functions related to the WYSIWYG editor and the media input filter.
6 6
 */
7 7

  
8
define('MEDIA_WYSIWYG_TOKEN_REGEX', '/\[\[\{.*?"type":"media".+?\}\]\]/s');
8
define('MEDIA_WYSIWYG_TOKEN_REGEX', '/\[\[\{.*?"type":"media".*?\}\]\]/s');
9 9

  
10 10
/**
11 11
 * Filter callback for media markup filter.
......
140 140
  $match = str_replace("]]", "", $match);
141 141
  $tag = $match[0];
142 142

  
143
  // Drupal modules with email support often include site name in the subject line
144
  // wrapped in brackets. With a token, this is rendered as "[[site:name]]". Such a
145
  // format will cause a conflict with media_wysiwyg, which is looking for the same.
146
  if (module_exists('token_filter')) {
147
    $token_filter = _token_filter_filter_tokens('[' . $tag . ']', '', '', $langcode, NULL, NULL);
148
    if ($token_filter != '[' . $tag . ']') {
149
      return '[[' . $tag . ']]';
150
    }
151
  }
152

  
143 153
  try {
144 154
    if (!is_string($tag)) {
145 155
      throw new Exception('Unable to find matching tag');
drupal7/sites/all/modules/media/modules/media_wysiwyg/includes/media_wysiwyg.pages.inc
180 180
      'class' => 'button',
181 181
      'title' => t('Use for replace fox or edit file fields.'),
182 182
    ),
183
    'query' => drupal_get_destination(),
183 184
  );
184 185
  if (!empty($_GET['render'])) {
185 186
    $link_options['query']['render'] = $_GET['render'];
drupal7/sites/all/modules/media/modules/media_wysiwyg/media_wysiwyg.info
16 16

  
17 17
configure = admin/config/media/browser
18 18

  
19
; Information added by Drupal.org packaging script on 2018-04-25
20
version = "7.x-2.19"
19
; Information added by Drupal.org packaging script on 2018-08-17
20
version = "7.x-2.20"
21 21
core = "7.x"
22 22
project = "media"
23
datestamp = "1524677887"
23
datestamp = "1534544300"
drupal7/sites/all/modules/media/modules/media_wysiwyg_view_mode/media_wysiwyg_view_mode.info
3 3
package = Media
4 4
core = 7.x
5 5

  
6
; Information added by Drupal.org packaging script on 2018-04-25
7
version = "7.x-2.19"
6
; Information added by Drupal.org packaging script on 2018-08-17
7
version = "7.x-2.20"
8 8
core = "7.x"
9 9
project = "media"
10
datestamp = "1524677887"
10
datestamp = "1534544300"
drupal7/sites/all/modules/media/modules/mediafield/mediafield.info
4 4
core = 7.x
5 5
dependencies[] = media
6 6

  
7
; Information added by Drupal.org packaging script on 2018-04-25
8
version = "7.x-2.19"
7
; Information added by Drupal.org packaging script on 2018-08-17
8
version = "7.x-2.20"
9 9
core = "7.x"
10 10
project = "media"
11
datestamp = "1524677887"
11
datestamp = "1534544300"
drupal7/sites/all/modules/media/tests/media_module_test.info
6 6

  
7 7
files[] = includes/MediaModuleTest.inc
8 8

  
9
; Information added by Drupal.org packaging script on 2018-04-25
10
version = "7.x-2.19"
9
; Information added by Drupal.org packaging script on 2018-08-17
10
version = "7.x-2.20"
11 11
core = "7.x"
12 12
project = "media"
13
datestamp = "1524677887"
13
datestamp = "1534544300"

Formats disponibles : Unified diff