Projet

Général

Profil

Révision 0939d55c

Ajouté par Assos Assos il y a environ 7 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/media/includes/media.fields.inc
134 134
  elseif (module_exists('translation') && $element['#entity_type'] == 'node' && translation_supported_type($element['#entity']->type)) {
135 135
    $element['#media_parent_entity_form_langcode'] = $element['#entity']->language;
136 136
    $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')) {
138 138
    $element['#media_parent_entity_form_langcode'] = $form['#entity']->language;
139 139
  }
140 140

  
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 2017-02-03
28
version = "7.x-2.0-rc5"
27
; Information added by Drupal.org packaging script on 2017-02-28
28
version = "7.x-2.0-rc11"
29 29
core = "7.x"
30 30
project = "media"
31
datestamp = "1486142925"
31
datestamp = "1488279796"
32 32

  
drupal7/sites/all/modules/media/media.install
869 869
      // Merge existing type with new ones.
870 870
      if ($new_type = file_type_load($type->name)) {
871 871
        $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
        }
873 878
      }
874 879
      else {
875 880
        $new_type = $type;
drupal7/sites/all/modules/media/media.module
828 828
  // Media browser attach code.
829 829
  $element['#attached']['js'][] = drupal_get_path('module', 'media') . '/js/media.js';
830 830

  
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

  
831 836
  // Add the media options to the page as JavaScript settings.
832 837
  $element['browse_button']['#attached']['js'] = array(
833 838
    array(
834 839
      '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'])))
836 841
    )
837 842
  );
838 843

  
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 2017-02-03
19
version = "7.x-2.0-rc5"
18
; Information added by Drupal.org packaging script on 2017-02-28
19
version = "7.x-2.0-rc11"
20 20
core = "7.x"
21 21
project = "media"
22
datestamp = "1486142925"
22
datestamp = "1488279796"
23 23

  
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 2017-02-03
16
version = "7.x-2.0-rc5"
15
; Information added by Drupal.org packaging script on 2017-02-28
16
version = "7.x-2.0-rc11"
17 17
core = "7.x"
18 18
project = "media"
19
datestamp = "1486142925"
19
datestamp = "1488279796"
20 20

  
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 2017-02-03
11
version = "7.x-2.0-rc5"
10
; Information added by Drupal.org packaging script on 2017-02-28
11
version = "7.x-2.0-rc11"
12 12
core = "7.x"
13 13
project = "media"
14
datestamp = "1486142925"
14
datestamp = "1488279796"
15 15

  
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 2017-02-03
12
version = "7.x-2.0-rc5"
11
; Information added by Drupal.org packaging script on 2017-02-28
12
version = "7.x-2.0-rc11"
13 13
core = "7.x"
14 14
project = "media"
15
datestamp = "1486142925"
15
datestamp = "1488279796"
16 16

  
drupal7/sites/all/modules/media/modules/media_wysiwyg/js/media_wysiwyg.filter.js
181 181
        $(mediaElements).each(function (i) {
182 182
          // Attempt to derive a JSON macro representation of the media placeholder.
183 183
          // Note: Drupal 7 ships with JQuery 1.4.4, which allows $(this).attr('outerHTML') to retrieve the eement's HTML,
184
          // but many sites use JQuery update to increate this to 1.6+, which insists on $(this).prop('outerHTML). 
185
          // Until the minimum jQuery is >= 1.6, we need to do this the old-school way. 
184
          // but many sites use JQuery update to increate this to 1.6+, which insists on $(this).prop('outerHTML).
185
          // Until the minimum jQuery is >= 1.6, we need to do this the old-school way.
186 186
          // See http://stackoverflow.com/questions/2419749/get-selected-elements-outer-html
187 187
          var markup = $(this).get(0).outerHTML;
188 188
          if (markup === undefined) {
......
291 291
      }
292 292
      element.addClass(classes.join(' '));
293 293

  
294
      // Attempt to override the link_title if the user has chosen to do this.
295
      info.link_text = this.overrideLinkTitle(info);
294 296
      // Apply link_text if present.
295 297
      if (info.link_text) {
296 298
        $('a', element).html(info.link_text);
......
309 311
      var file_info = Drupal.media.filter.extract_file_info(element);
310 312
      if (file_info) {
311 313
        if (typeof file_info.link_text == 'string') {
314
          file_info.link_text = this.overrideLinkTitle(file_info);
312 315
          // Make sure the link_text-html-tags are properly escaped.
313 316
          file_info.link_text = file_info.link_text.replace(/</g, '&lt;').replace(/>/g, '&gt;');
314 317
        }
......
430 433
      return Drupal.settings.tagmap;
431 434
    },
432 435

  
436
    /**
437
     * Return the overridden link title based on the file_entity title field
438
     * set.
439
     * @param file the file object.
440
     * @returns the overridden link_title or the existing link text if no
441
     * overridden.
442
     */
443
    overrideLinkTitle: function(file) {
444
      var file_title_field = Drupal.settings.media.img_title_field.replace('field_', '');
445
      var file_title_field_machine_name = '';
446
      if (typeof(file.fields) != 'undefined') {
447
        jQuery.each(file.fields, function(field, fieldValue) {
448
          if (field.indexOf(file_title_field) != -1) {
449
            file_title_field_machine_name = field;
450
          }
451
        });
452

  
453
        if (typeof(file.fields[file_title_field_machine_name]) != 'undefined' && file.fields[file_title_field_machine_name] != '') {
454
          return file.fields[file_title_field_machine_name];
455
        }
456
        else {
457
          return file.link_text;
458
        }
459
      }
460
      else {
461
        return file.link_text;
462
      }
463
    },
464

  
433 465
    /**
434 466
     * Generates a unique "delta" for each embedding of a particular file.
435 467
     */
436 468
    fileEmbedDelta: function(fid, element) {
437 469
      // Ensure we have an object to track our deltas.
438 470
      Drupal.settings.mediaDeltas = Drupal.settings.mediaDeltas || {};
471
      Drupal.settings.maxMediaDelta = Drupal.settings.maxMediaDelta || 0;
439 472

  
440 473
      // Check to see if the element already has one.
441 474
      if (element && element.data('delta')) {
442 475
        var existingDelta = element.data('delta');
443
        // If so, make sure that it is being tracked in mediaDeltas.
444
        if (!Drupal.settings.mediaDeltas[fid]) {
445
          Drupal.settings.mediaDeltas[fid] = existingDelta;
476
        // If so, make sure that it is being tracked in mediaDeltas. If we're
477
        // going to create new deltas later on, make sure they do not overwrite
478
        // other mediaDeltas.
479
        if (!Drupal.settings.mediaDeltas[existingDelta]) {
480
          Drupal.settings.mediaDeltas[existingDelta] = fid;
481
          Drupal.settings.maxMediaDelta = Math.max(Drupal.settings.maxMediaDelta, existingDelta);
446 482
        }
447 483
        return existingDelta;
448 484
      }
449
      // Otherwise, generate a new one. Arbitrarily start with 1.
450
      var delta = 1;
451
      if (Drupal.settings.mediaDeltas[fid]) {
452
        delta = Drupal.settings.mediaDeltas[fid] + 1;
453
      }
454
      Drupal.settings.mediaDeltas[fid] = delta;
455
      return delta;
485
      // Otherwise, generate a new one.
486
      var newDelta = Drupal.settings.maxMediaDelta + 1;
487
      Drupal.settings.mediaDeltas[newDelta] = fid;
488
      Drupal.settings.maxMediaDelta = newDelta;
489
      return newDelta;
456 490
    }
457 491
  }
458 492

  
drupal7/sites/all/modules/media/modules/media_wysiwyg/media_wysiwyg.info
15 15

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

  
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-02-28
19
version = "7.x-2.0-rc11"
20 20
core = "7.x"
21 21
project = "media"
22
datestamp = "1486142925"
22
datestamp = "1488279796"
23 23

  
drupal7/sites/all/modules/media/modules/media_wysiwyg/media_wysiwyg.install
5 5
 * Install, update and uninstall functions for the Media WYSIWYG module.
6 6
 */
7 7

  
8
 /**
8
/**
9 9
 * Implements hook_schema().
10 10
 */
11 11
function media_wysiwyg_schema() {
......
125 125

  
126 126
  return $output;
127 127
}
128

  
128 129
/**
129 130
 * Whitelists certain fields for WYSIWYG overriding.
130 131
 */
......
170 171

  
171 172
  // Create the new configuration tables.
172 173
  if (!db_table_exists('media_restrict_wysiwyg')) {
173
    db_create_table('media_restrict_wysiwyg',  $schema['media_restrict_wysiwyg']);
174
    db_create_table('media_restrict_wysiwyg', $schema['media_restrict_wysiwyg']);
174 175
    db_create_table('media_view_mode_wysiwyg', $schema['media_view_mode_wysiwyg']);
175 176
  }
176 177

  
177 178
  // Migrate the configuration from the old variables into the new DB tables.
178 179
  $types = file_type_load_all(TRUE);
179 180
  foreach ($types as $type) {
180
    $wysiwyg_restricted_view_modes = variable_get("media_wysiwyg_view_mode_{$type->type}_wysiwyg_restricted_view_modes", array());
181
    foreach ($wysiwyg_restricted_view_modes as $wysiwyg_restricted_view_mode) {
182
      db_insert('media_restrict_wysiwyg')
181
    $enabled = variable_get("media_wysiwyg_view_mode_" . $type->type . "_file__wysiwyg_restricted_view_modes_status", FALSE);
182
    if ($enabled) {
183
      $wysiwyg_restricted_view_modes = variable_get("media_wysiwyg_view_mode_" . $type->type . "_file_wysiwyg_restricted_view_modes", array());
184
      foreach ($wysiwyg_restricted_view_modes as $wysiwyg_restricted_view_mode) {
185
        db_insert('media_restrict_wysiwyg')
186
          ->fields(array(
187
            'type' => $type->type,
188
            'display' => $wysiwyg_restricted_view_mode,
189
          ))
190
          ->execute();
191
      }
192
    }
193

  
194
    $enabled = variable_get("media_wysiwyg_view_mode_" . $type->type . "_wysiwyg_view_mode_status");
195
    if ($enabled) {
196
      $file_wysiwyg_view_mode = variable_get("media_wysiwyg_view_mode_" . $type->type . "_file_wysiwyg_view_mode", 'wysiwyg');
197
      db_insert('media_view_mode_wysiwyg')
183 198
        ->fields(array(
184 199
          'type' => $type->type,
185
          'display' => $wysiwyg_restricted_view_mode,
200
          'view_mode' => $file_wysiwyg_view_mode,
186 201
        ))
187 202
        ->execute();
188 203
    }
189

  
190
    $file_wysiwyg_view_mode = variable_get("media_wysiwyg_view_mode_{$type->type}_file_wysiwyg_view_mode", 'wysiwyg');
191
    db_insert('media_view_mode_wysiwyg')
192
      ->fields(array(
193
        'type' => $type->type,
194
        'view_mode' => $file_wysiwyg_view_mode,
195
      ))
196
      ->execute();
197 204
  }
198 205

  
199 206
  // Remove old configuration variables.
......
233 240
 */
234 241
function media_wysiwyg_update_7206() {
235 242
  $message = t('If you would like to be able to align your embedded media (left, right, or center), go to /admin/config/media/browser and check "Provide alignment option when embedding media", and save the settings.');
236
  drupal_set_message($message,'warning',TRUE);
243
  drupal_set_message($message, 'warning', TRUE);
237 244
}
238

  
239

  
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 2017-02-03
7
version = "7.x-2.0-rc5"
6
; Information added by Drupal.org packaging script on 2017-02-28
7
version = "7.x-2.0-rc11"
8 8
core = "7.x"
9 9
project = "media"
10
datestamp = "1486142925"
10
datestamp = "1488279796"
11 11

  
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 2017-02-03
8
version = "7.x-2.0-rc5"
7
; Information added by Drupal.org packaging script on 2017-02-28
8
version = "7.x-2.0-rc11"
9 9
core = "7.x"
10 10
project = "media"
11
datestamp = "1486142925"
11
datestamp = "1488279796"
12 12

  
drupal7/sites/all/modules/media/tests/media.test
915 915
    $multiselect = ($field['cardinality'] > 1 || $field['cardinality'] == FIELD_CARDINALITY_UNLIMITED);
916 916
    $field_widget = array(
917 917
        'elements' => array(
918
          '#edit-' . $field_name . '-' . LANGUAGE_NONE . '-0-upload' => array(
918
          '.js-media-element-edit-' . $field_name . '-' . LANGUAGE_NONE . '-0-upload' => array(
919 919
            'global' => array(
920 920
              'types' => array(
921 921
                'image' => 'image',
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 2017-02-03
10
version = "7.x-2.0-rc5"
9
; Information added by Drupal.org packaging script on 2017-02-28
10
version = "7.x-2.0-rc11"
11 11
core = "7.x"
12 12
project = "media"
13
datestamp = "1486142925"
13
datestamp = "1488279796"
14 14

  
drupal7/sites/all/modules/views_slideshow/contrib/views_slideshow_cycle/js/views_slideshow_cycle.js
497 497
    // Make sure the slideshow isn't already loaded.
498 498
    if (!settings.loaded) {
499 499
      $(settings.targetId).cycle(settings.opts);
500
      $(settings.targetId).parent().parent().addClass('views-slideshow-cycle-processed');
500 501
      settings.loaded = true;
501 502

  
502 503
      // Start Paused
drupal7/sites/all/modules/views_slideshow/contrib/views_slideshow_cycle/views_slideshow_cycle.css
8 8
  display: none;
9 9
}
10 10

  
11
.jquery-once-1-processed .views-slideshow-controls-bottom,
12
.jquery-once-1-processed .views-slideshow-controls-top {
11
.views-slideshow-cycle-processed .views-slideshow-controls-bottom,
12
.views-slideshow-cycle-processed .views-slideshow-controls-top {
13 13
  display: block;
14 14
}
15 15

  
drupal7/sites/all/modules/views_slideshow/contrib/views_slideshow_cycle/views_slideshow_cycle.info
5 5
package = Views
6 6
core = 7.x
7 7

  
8
; Information added by Drupal.org packaging script on 2017-02-16
9
version = "7.x-3.6"
8
; Information added by Drupal.org packaging script on 2017-02-28
9
version = "7.x-3.7"
10 10
core = "7.x"
11 11
project = "views_slideshow"
12
datestamp = "1487211486"
12
datestamp = "1488323886"
13 13

  
drupal7/sites/all/modules/views_slideshow/contrib/views_slideshow_cycle/views_slideshow_cycle.install
13 13

  
14 14
  // If installing via Drush skip requirement checking here.
15 15
  if (php_sapi_name() == 'cli') {
16
    return;
16
    return $requirements;
17 17
  }
18 18

  
19 19
  // Ensure translations do not break at install time.
drupal7/sites/all/modules/views_slideshow/contrib/views_slideshow_simple_pager/pager.css
1
.views-slideshow-pager-field-item {
2
  display: inline;
3
}
4

  
5
.views-slideshow-pager-field-item.active {
6
  text-decoration: underline;
7
  font-weight: bold;
8
}
drupal7/sites/all/modules/views_slideshow/contrib/views_slideshow_simple_pager/views_slideshow_simple_pager.info
1
name = Views Slideshow Simple Pager
2
description = Provides a simple pager for Views Slideshow.
3
dependencies[] = views_slideshow
4
package = Views
5
core = 7.x
6

  
7
; Information added by Drupal.org packaging script on 2017-02-28
8
version = "7.x-3.7"
9
core = "7.x"
10
project = "views_slideshow"
11
datestamp = "1488323886"
12

  
drupal7/sites/all/modules/views_slideshow/contrib/views_slideshow_simple_pager/views_slideshow_simple_pager.module
1
<?php
2

  
3
/**
4
 * @file
5
 * Provides a simple numeric counter pager for views_slideshow.
6
 */
7

  
8
/**
9
 * Implements hook_views_slideshow_widget_pager_info().
10
 */
11
function views_slideshow_simple_pager_views_slideshow_widget_pager_info($view) {
12
  return array(
13
    'views_slideshow_simple_pager' => array(
14
      'name' => t('Simple counter'),
15
    ),
16
  );
17
}
18

  
19
/**
20
 * Implements hook_theme().
21
 */
22
function views_slideshow_simple_pager_theme($existing, $type, $theme, $path) {
23
  return array(
24
    'views_slideshow_simple_pager' => array(
25
      'variables' => array(
26
        'vss_id' => NULL,
27
        'view' => NULL,
28
        'settings' => array(),
29
        'location' => NULL,
30
        'attributes' => array(),
31
      ),
32
      'template' => 'theme/views-slideshow-pager-fields',
33
      'path' => drupal_get_path('module', 'views_slideshow'),
34
    ),
35
  );
36
}
37

  
38
/**
39
 * Template preprocess function for Views Slideshow simple pager.
40
 */
41
function template_preprocess_views_slideshow_simple_pager(&$vars) {
42
  // Call the fields pager preprocess function.
43
  _views_slideshow_preprocess_views_slideshow_pager_fields($vars);
44

  
45
  // Override the (empty) rendered field items with our simple pager.
46
  $vars['rendered_field_items'] = '';
47
  if (empty($vars['settings']['hide_on_single_slide']) || count($vars['view']->result) > 1) {
48
    // Each slide can contain more than one item.
49
    $items_per_slide = $vars['view']->style_options['views_slideshow_cycle']['items_per_slide'];
50
    // The remainder will be put on an additional slide.
51
    $count_remainder = count($vars['view']->result) % $items_per_slide;
52
    // Figure out the number of slides based on result count
53
    // and items per slide, plus one if there is a remainder.
54
    $slide_count = ($count_remainder) ? floor(count($vars['view']->result) / $items_per_slide) + 1 : floor(count($vars['view']->result) / $items_per_slide);
55
    for ($count = 0; $count < $slide_count; ++$count) {
56
      $counted = $count + 1;
57
      $vars['rendered_field_items'] .= theme('views_slideshow_pager_field_item', array(
58
        'vss_id' => $vars['vss_id'],
59
        'item' => l($counted, 'javascript:void(0)', array(
60
          'fragment' => '',
61
          'external' => TRUE,
62
        )),
63
        'count' => $count,
64
        'location' => $vars['location'],
65
      ));
66
    }
67
  }
68

  
69
  // Clone the pager fields JavaScript object and methods.
70
  drupal_add_js('Drupal.viewsSlideshowSimplePager = Drupal.viewsSlideshowPagerFields || {};', 'inline');
71

  
72
  // Add anchor tags in the pager.
73
  drupal_add_js('var uniquePagerID =
74
    jQuery(".views-slideshow-pager-field-item").click(function() {
75
      var eID = jQuery(this).attr("id").replace("views_slideshow_pager_field_item_bottom_","");
76
      var ssID = eID.substring(0,eID.lastIndex("_"));
77
      var sN = eID.substring(eID.lastIndex("_") + 1);
78
      Drupal.viewsSlideshow.action({ "action": "goToSlide", "slideshowID": ssID, "slideNum": sN });
79
    });
80
  ', 'inline');
81

  
82
  // Add minimal styling.
83
  drupal_add_css(drupal_get_path('module', 'views_slideshow_simple_pager') . '/pager.css', array(
84
    'group' => CSS_DEFAULT,
85
    'type' => 'file',
86
  ));
87
}
drupal7/sites/all/modules/views_slideshow/js/views_slideshow.js
148 148
    try {
149 149
      if (typeof Drupal.settings.viewsSlideshowPager != "undefined" && typeof Drupal.settings.viewsSlideshowPager[options.slideshowID].top.type != "undefined" && typeof Drupal[Drupal.settings.viewsSlideshowPager[options.slideshowID].top.type].transitionBegin == 'function') {
150 150
        Drupal[Drupal.settings.viewsSlideshowPager[options.slideshowID].top.type].transitionBegin(options);
151
        if (Drupal.settings.viewsSlideshowPager[options.slideshowID].top.master_pager) {
151
        if (Drupal.settings.viewsSlideshowPager[options.slideshowID].top.master_pager === 1) {
152 152
          $.each(Drupal.settings.viewsSlideshow, function(i, obj) {
153 153
            if (i != options.slideshowID) {
154 154
              options.slideshowID = i;
......
166 166
    try {
167 167
      if (typeof Drupal.settings.viewsSlideshowPager != "undefined" && typeof Drupal.settings.viewsSlideshowPager[options.slideshowID].bottom.type != "undefined" && typeof Drupal[Drupal.settings.viewsSlideshowPager[options.slideshowID].bottom.type].transitionBegin == 'function') {
168 168
        Drupal[Drupal.settings.viewsSlideshowPager[options.slideshowID].bottom.type].transitionBegin(options);
169
        if (Drupal.settings.viewsSlideshowPager[options.slideshowID].bottom.master_pager) {
169
        if (Drupal.settings.viewsSlideshowPager[options.slideshowID].bottom.master_pager === 1) {
170 170
          $.each(Drupal.settings.viewsSlideshow, function(i, obj) {
171 171
            if (i != options.slideshowID) {
172 172
              options.slideshowID = i;
drupal7/sites/all/modules/views_slideshow/theme/views_slideshow.theme.inc
195 195
  if (isset($vars['settings']['hide_on_single_slide']) && $vars['settings']['hide_on_single_slide'] === 1 && count($vars['rows']) < 2) {
196 196
    return '';
197 197
  }
198

  
198
  $master_pager = isset($vars['settings']['master_pager']) ? views_slideshow_format_addons_name($vars['settings']['master_pager']) : '';
199 199
  // Add JavaScript settings for the pager type.
200 200
  $js_vars = array(
201 201
    'viewsSlideshowPager' => array(
202 202
      $vars['vss_id'] => array(
203 203
        $vars['location'] => array(
204 204
          'type' => views_slideshow_format_addons_name($vars['settings']['type']),
205
          'master_pager' => views_slideshow_format_addons_name($vars['settings']['master_pager']),
205
          'master_pager' => $master_pager,
206 206
        ),
207 207
      ),
208 208
    ),
drupal7/sites/all/modules/views_slideshow/views_slideshow.info
6 6

  
7 7
files[] = views_slideshow_plugin_style_slideshow.inc
8 8

  
9
; Information added by Drupal.org packaging script on 2017-02-16
10
version = "7.x-3.6"
9
; Information added by Drupal.org packaging script on 2017-02-28
10
version = "7.x-3.7"
11 11
core = "7.x"
12 12
project = "views_slideshow"
13
datestamp = "1487211486"
13
datestamp = "1488323886"
14 14

  
drupal7/sites/all/themes/bootstrap/bootstrap.info
208 208
multipliers[screen-lg-min][] = 1.5x
209 209
multipliers[screen-lg-min][] = 2x
210 210

  
211
; Information added by Drupal.org packaging script on 2017-02-21
212
version = "7.x-3.11"
211
; Information added by Drupal.org packaging script on 2017-02-27
212
version = "7.x-3.12"
213 213
core = "7.x"
214 214
project = "bootstrap"
215
datestamp = "1487641388"
215
datestamp = "1488215888"
216 216

  
drupal7/sites/all/themes/bootstrap/templates/date/date-views-pager.vars.php
40 40
  );
41 41

  
42 42
  // Create necessary links.
43
  $items = [];
43
  $items = array();
44 44
  foreach ($types as $type => $text) {
45 45
    $item_classes = array($type);
46 46

  
drupal7/sites/all/themes/bootstrap/templates/menu/menu-link.func.php
24 24

  
25 25
  $options = !empty($element['#localized_options']) ? $element['#localized_options'] : array();
26 26

  
27
  // Filter the title if the "html" is not set, otherwise l() will automatically
28
  // sanitize using check_plain(), so no need to call that here.
29
  $title = empty($options['html']) ? filter_xss_admin($element['#title']) : $element['#title'];
27
  // Check plain title if "html" is not set, otherwise, filter for XSS attacks.
28
  $title = empty($options['html']) ? check_plain($element['#title']) : filter_xss_admin($element['#title']);
29

  
30
  // Ensure "html" is now enabled so l() doesn't double encode. This is now
31
  // safe to do since both check_plain() and filter_xss_admin() encode HTML
32
  // entities. See: https://www.drupal.org/node/2854978
33
  $options['html'] = TRUE;
30 34

  
31 35
  $href = $element['#href'];
32 36
  $attributes = !empty($element['#attributes']) ? $element['#attributes'] : array();
......
46 50
      $title .= ' <span class="caret"></span>';
47 51
      $attributes['class'][] = 'dropdown';
48 52

  
49
      $options['html'] = TRUE;
50

  
51 53
      // Set dropdown trigger element to # to prevent inadvertant page loading
52 54
      // when a submenu link is clicked.
53 55
      $options['attributes']['data-target'] = '#';
drupal7/sites/all/themes/bootstrap/templates/node/node.tpl.php
102 102
    hide($content['field_tags']);
103 103
    print render($content);
104 104
  ?>
105
  <?php if (!empty($content['field_tags']) || !empty($content['links'])): ?>
106
  <footer>
107
    <?php print render($content['field_tags']); ?>
108
    <?php print render($content['links']); ?>
105
  <?php
106
    // Only display the wrapper div if there are tags or links.
107
    $field_tags = render($content['field_tags']);
108
    $links = render($content['links']);
109
    if ($field_tags || $links):
110
  ?>
111
   <footer>
112
     <?php print $field_tags; ?>
113
     <?php print $links; ?>
109 114
  </footer>
110 115
  <?php endif; ?>
111 116
  <?php print render($content['comments']); ?>
drupal7/sites/all/themes/bootstrap/templates/system/button.vars.php
35 35
  // Colorize button.
36 36
  _bootstrap_colorize_button($element);
37 37

  
38
  // Iconize button.
39
  _bootstrap_iconize_button($element);
40

  
38 41
  // Add in the button type class.
39 42
  $element['#attributes']['class'][] = 'form-' . $element['#button_type'];
40 43

  

Formats disponibles : Unified diff