Projet

Général

Profil

Révision 30d5b9c5

Ajouté par Mathieu Schiano Di Schiabica il y a environ 8 ans

Update to 7.42

Voir les différences:

drupal7/.htaccess
3 3
#
4 4

  
5 5
# Protect files and directories from prying eyes.
6
<FilesMatch "\.(engine|inc|info|install|make|module|profile|test|po|sh|.*sql|theme|tpl(\.php)?|xtmpl)(~|\.sw[op]|\.bak|\.orig|\.save)?$|^(\..*|Entries.*|Repository|Root|Tag|Template)$|^#.*#$|\.php(~|\.sw[op]|\.bak|\.orig\.save)$">
6
<FilesMatch "\.(engine|inc|info|install|make|module|profile|test|po|sh|.*sql|theme|tpl(\.php)?|xtmpl)(~|\.sw[op]|\.bak|\.orig|\.save)?$|^(\..*|Entries.*|Repository|Root|Tag|Template|composer\.(json|lock))$|^#.*#$|\.php(~|\.sw[op]|\.bak|\.orig\.save)$">
7 7
  Order allow,deny
8 8
</FilesMatch>
9 9

  
drupal7/CHANGELOG.txt
1 1

  
2
Drupal 7.42, 2016-02-03
3
-----------------------
4
- Stopped invoking hook_flush_caches() on every cron run, since some modules
5
  use that hook for expensive operations that are only needed on cache clears.
6
- Changed the default .htaccess and web.config to block Composer-related files.
7
- Added static caching to module_load_include() to improve performance.
8
- Fixed double-encoding bugs in select field widgets provided by the Options
9
  module. The fix deprecates the 'strip_tags' property on option widgets and
10
  replaces it with a new 'strip_tags_and_unescape' property (minor data
11
  structure change).
12
- Improved MySQL 5.7 support by changing the MySQL database driver to stop
13
  using the ANSI SQL mode alias, which has different meanings for different
14
  MySQL versions.
15
- Fixed a regression introduced in Drupal 7.39 which prevented autocomplete
16
  functionality from working on servers that are not configured to
17
  automatically recognize index.php.
18
- Updated the Archive_Tar PEAR package to the latest 1.4.0 release, to fix bugs
19
  with tar file handling on various operating systems.
20
- Fixed fatal errors on node preview when a field is displayed in the node
21
  teaser but hidden in the full node view. The fix removes a
22
  field_attach_prepare_view() call from the node_preview() function since it is
23
  redundant with one in the node preview theme layer.
24
- Improved the description of the "Trimmed" format option on text fields
25
  (translatable string change, and minor UI and data structure change).
26
- Numerous small bug fixes.
27
- Numerous API documentation improvements.
28
- Additional automated test coverage.
29

  
2 30
Drupal 7.41, 2015-10-21
3 31
-----------------------
4 32
- Fixed security issues (open redirect). See SA-CORE-2015-004.
drupal7/includes/bootstrap.inc
8 8
/**
9 9
 * The current system version.
10 10
 */
11
define('VERSION', '7.41');
11
define('VERSION', '7.42');
12 12

  
13 13
/**
14 14
 * Core API compatibility.
......
2786 2786
}
2787 2787

  
2788 2788
/**
2789
 * Returns the default language used on the site
2789
 * Returns the default language, as an object, or one of its properties.
2790 2790
 *
2791 2791
 * @param $property
2792
 *   Optional property of the language object to return
2792
 *   (optional) The property of the language object to return.
2793
 *
2794
 * @return
2795
 *   Either the language object for the default language used on the site,
2796
 *   or the property of that object named in the $property parameter.
2793 2797
 */
2794 2798
function language_default($property = NULL) {
2795 2799
  $language = variable_get('language_default', (object) array('language' => 'en', 'name' => 'English', 'native' => 'English', 'direction' => 0, 'enabled' => 1, 'plurals' => 0, 'formula' => '', 'domain' => '', 'prefix' => '', 'weight' => 0, 'javascript' => ''));
drupal7/includes/database/mysql/database.inc
81 81
      'init_commands' => array(),
82 82
    );
83 83
    $connection_options['init_commands'] += array(
84
      'sql_mode' => "SET sql_mode = 'ANSI,STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER'",
84
      'sql_mode' => "SET sql_mode = 'REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER'",
85 85
    );
86 86
    // Execute initial commands.
87 87
    foreach ($connection_options['init_commands'] as $sql) {
drupal7/includes/form.inc
3385 3385
/**
3386 3386
 * Returns HTML to wrap child elements in a container.
3387 3387
 *
3388
 * Used for grouped form items. Can also be used as a #theme_wrapper for any
3388
 * Used for grouped form items. Can also be used as a theme wrapper for any
3389 3389
 * renderable element, to surround it with a <div> and add attributes such as
3390
 * classes or an HTML id.
3390
 * classes or an HTML ID.
3391
 *
3392
 * See the @link forms_api_reference.html Form API reference @endlink for more
3393
 * information on the #theme_wrappers render array property.
3391 3394
 *
3392 3395
 * @param $variables
3393 3396
 *   An associative array containing:
......
3979 3982
    // browser interpreting the path plus search string as an actual file.
3980 3983
    $current_clean_url = isset($GLOBALS['conf']['clean_url']) ? $GLOBALS['conf']['clean_url'] : NULL;
3981 3984
    $GLOBALS['conf']['clean_url'] = 0;
3982
    $element['#autocomplete_input']['#url_value'] = url($element['#autocomplete_path'], array('absolute' => TRUE));
3985
    // Force the script path to 'index.php', in case the server is not
3986
    // configured to find it automatically. Normally it is the responsibility
3987
    // of the site to do this themselves using hook_url_outbound_alter() (see
3988
    // url()) but since this code is forcing non-clean URLs on sites that don't
3989
    // normally use them, it is done here instead.
3990
    $element['#autocomplete_input']['#url_value'] = url($element['#autocomplete_path'], array('absolute' => TRUE, 'script' => 'index.php'));
3983 3991
    $GLOBALS['conf']['clean_url'] = $current_clean_url;
3984 3992
  }
3985 3993
  return $element;
drupal7/includes/install.inc
750 750
/**
751 751
 * Uninstalls a given list of disabled modules.
752 752
 *
753
 * @param array $module_list
753
 * @param string[] $module_list
754 754
 *   The modules to uninstall. It is the caller's responsibility to ensure that
755 755
 *   all modules in this list have already been disabled before this function
756 756
 *   is called.
......
769 769
 *   included in $module_list).
770 770
 *
771 771
 * @see module_disable()
772
 * @see module_enable()
772 773
 */
773 774
function drupal_uninstall_modules($module_list = array(), $uninstall_dependents = TRUE) {
774 775
  if ($uninstall_dependents) {
drupal7/includes/mail.inc
566 566
  // Use soft-breaks only for purely quoted or unindented text.
567 567
  $line = wordwrap($line, 77 - $values['length'], $values['soft'] ? " \n" : "\n");
568 568
  // Break really long words at the maximum width allowed.
569
  $line = wordwrap($line, 996 - $values['length'], $values['soft'] ? " \n" : "\n");
569
  $line = wordwrap($line, 996 - $values['length'], $values['soft'] ? " \n" : "\n", TRUE);
570 570
}
571 571

  
572 572
/**
drupal7/includes/module.inc
320 320
 *   The name of the included file, if successful; FALSE otherwise.
321 321
 */
322 322
function module_load_include($type, $module, $name = NULL) {
323
  static $files = array();
324

  
323 325
  if (!isset($name)) {
324 326
    $name = $module;
325 327
  }
326 328

  
329
  $key = $type . ':' . $module . ':' . $name;
330
  if (isset($files[$key])) {
331
    return $files[$key];
332
  }
333

  
327 334
  if (function_exists('drupal_get_path')) {
328 335
    $file = DRUPAL_ROOT . '/' . drupal_get_path('module', $module) . "/$name.$type";
329 336
    if (is_file($file)) {
330 337
      require_once $file;
338
      $files[$key] = $file;
331 339
      return $file;
332 340
    }
341
    else {
342
      $files[$key] = FALSE;
343
    }
333 344
  }
334 345
  return FALSE;
335 346
}
......
365 376
 * - Invoke hook_modules_installed().
366 377
 * - Invoke hook_modules_enabled().
367 378
 *
368
 * @param $module_list
379
 * @param string[] $module_list
369 380
 *   An array of module names.
370
 * @param $enable_dependencies
381
 * @param bool $enable_dependencies
371 382
 *   If TRUE, dependencies will automatically be added and enabled in the
372 383
 *   correct order. This incurs a significant performance cost, so use FALSE
373 384
 *   if you know $module_list is already complete and in the correct order.
374 385
 *
375
 * @return
386
 * @return bool
376 387
 *   FALSE if one or more dependencies are missing, TRUE otherwise.
377 388
 *
378 389
 * @see hook_install()
379 390
 * @see hook_enable()
380 391
 * @see hook_modules_installed()
381 392
 * @see hook_modules_enabled()
393
 * @see module_disable()
394
 * @see drupal_uninstall_modules()
382 395
 */
383 396
function module_enable($module_list, $enable_dependencies = TRUE) {
384 397
  if ($enable_dependencies) {
......
505 518
/**
506 519
 * Disables a given set of modules.
507 520
 *
508
 * @param $module_list
521
 * @param string[] $module_list
509 522
 *   An array of module names.
510
 * @param $disable_dependents
523
 * @param bool $disable_dependents
511 524
 *   If TRUE, dependent modules will automatically be added and disabled in the
512 525
 *   correct order. This incurs a significant performance cost, so use FALSE
513 526
 *   if you know $module_list is already complete and in the correct order.
527
 *
528
 * @see drupal_uninstall_modules()
529
 * @see module_enable()
514 530
 */
515 531
function module_disable($module_list, $disable_dependents = TRUE) {
516 532
  if ($disable_dependents) {
......
722 738
    drupal_static_reset('module_hook_info');
723 739
    drupal_static_reset('drupal_alter');
724 740
    cache_clear_all('hook_info', 'cache_bootstrap');
741
    cache_clear_all('system_cache_tables', 'cache');
725 742
    return;
726 743
  }
727 744

  
drupal7/includes/theme.inc
1809 1809
    foreach ($links as $key => $link) {
1810 1810
      $class = array($key);
1811 1811

  
1812
      // Add first, last and active classes to the list of links to help out themers.
1812
      // Add first, last and active classes to the list of links to help out
1813
      // themers.
1813 1814
      if ($i == 1) {
1814 1815
        $class[] = 'first';
1815 1816
      }
......
1827 1828
        $output .= l($link['title'], $link['href'], $link);
1828 1829
      }
1829 1830
      elseif (!empty($link['title'])) {
1830
        // Some links are actually not links, but we wrap these in <span> for adding title and class attributes.
1831
        // Some links are actually not links, but we wrap these in <span> for
1832
        // adding title and class attributes.
1831 1833
        if (empty($link['html'])) {
1832 1834
          $link['title'] = check_plain($link['title']);
1833 1835
        }
drupal7/modules/aggregator/aggregator.info
7 7
configure = admin/config/services/aggregator/settings
8 8
stylesheets[all][] = aggregator.css
9 9

  
10
; Information added by Drupal.org packaging script on 2015-10-21
11
version = "7.41"
10
; Information added by Drupal.org packaging script on 2016-02-03
11
version = "7.42"
12 12
project = "drupal"
13
datestamp = "1445457729"
13
datestamp = "1454517955"
14 14

  
drupal7/modules/aggregator/tests/aggregator_test.info
5 5
core = 7.x
6 6
hidden = TRUE
7 7

  
8
; Information added by Drupal.org packaging script on 2015-10-21
9
version = "7.41"
8
; Information added by Drupal.org packaging script on 2016-02-03
9
version = "7.42"
10 10
project = "drupal"
11
datestamp = "1445457729"
11
datestamp = "1454517955"
12 12

  
drupal7/modules/block/block.info
6 6
files[] = block.test
7 7
configure = admin/structure/block
8 8

  
9
; Information added by Drupal.org packaging script on 2015-10-21
10
version = "7.41"
9
; Information added by Drupal.org packaging script on 2016-02-03
10
version = "7.42"
11 11
project = "drupal"
12
datestamp = "1445457729"
12
datestamp = "1454517955"
13 13

  
drupal7/modules/block/block.module
16 16
define('BLOCK_CUSTOM_FIXED', 0);
17 17

  
18 18
/**
19
 *  Shows this block by default, but lets individual users hide it.
19
 * Shows this block by default, but lets individual users hide it.
20 20
 */
21 21
define('BLOCK_CUSTOM_ENABLED', 1);
22 22

  
......
59 59
      $output .= '<dd>' . t('Users with the <em>Administer blocks</em> permission can <a href="@block-add">add custom blocks</a>, which are then listed on the <a href="@blocks">Blocks administration page</a>. Once created, custom blocks behave just like default and module-generated blocks.', array('@blocks' => url('admin/structure/block'), '@block-add' => url('admin/structure/block/add'))) . '</dd>';
60 60
      $output .= '</dl>';
61 61
      return $output;
62

  
62 63
    case 'admin/structure/block/add':
63 64
      return '<p>' . t('Use this page to create a new custom block.') . '</p>';
64 65
  }
......
189 190
 * @param $theme
190 191
 *   The theme whose blocks are being configured. If not set, the default theme
191 192
 *   is assumed.
193
 *
192 194
 * @return
193 195
 *   The theme that should be used for the block configuration page, or NULL
194 196
 *   to indicate that the default theme should be used.
......
343 345
    // to perform contextual actions on the help block, and the links needlessly
344 346
    // draw attention on it.
345 347
    if ($key != 'system_main' && $key != 'system_help') {
346
      $build[$key]['#contextual_links']['block'] = array('admin/structure/block/manage', array($block->module, $block->delta));
348
      $build[$key]['#contextual_links']['block'] = array(
349
        'admin/structure/block/manage',
350
        array($block->module, $block->delta),
351
      );
347 352
    }
348 353

  
349 354
    $build[$key] += array(
......
386 391
  // Gather the blocks defined by modules.
387 392
  foreach (module_implements('block_info') as $module) {
388 393
    $module_blocks = module_invoke($module, 'block_info');
394
    $delta_list = array();
389 395
    foreach ($module_blocks as $delta => $block) {
390 396
      // Compile a condition to retrieve this block from the database.
391
      $condition = db_and()
392
        ->condition('module', $module)
393
        ->condition('delta', $delta);
394
      $or->condition($condition);
395 397
      // Add identifiers.
398
      $delta_list[] = $delta;
396 399
      $block['module'] = $module;
397
      $block['delta']  = $delta;
398
      $block['theme']  = $theme;
400
      $block['delta'] = $delta;
401
      $block['theme'] = $theme;
399 402
      $current_blocks[$module][$delta] = $block;
400 403
    }
404
    if (!empty($delta_list)) {
405
      $condition = db_and()->condition('module', $module)->condition('delta', $delta_list);
406
      $or->condition($condition);
407
    }
401 408
  }
402 409
  // Save the blocks defined in code for alter context.
403 410
  $code_blocks = $current_blocks;
......
644 651
    $regions = system_region_list($theme, REGIONS_VISIBLE);
645 652
    $result = db_query("SELECT * FROM {block} WHERE theme = :theme", array(':theme' => $default_theme), array('fetch' => PDO::FETCH_ASSOC));
646 653
    foreach ($result as $block) {
647
      // If the region isn't supported by the theme, assign the block to the theme's default region.
654
      // If the region isn't supported by the theme, assign the block to the
655
      // theme's default region.
648 656
      if ($block['status'] && !isset($regions[$block['region']])) {
649 657
        $block['region'] = system_default_region($theme);
650 658
      }
......
812 820
      // with different case. Ex: /Page, /page, /PAGE.
813 821
      $pages = drupal_strtolower($block->pages);
814 822
      if ($block->visibility < BLOCK_VISIBILITY_PHP) {
815
        // Convert the Drupal path to lowercase
823
        // Convert the Drupal path to lowercase.
816 824
        $path = drupal_strtolower(drupal_get_path_alias($_GET['q']));
817 825
        // Compare the lowercase internal and lowercase path alias (if any).
818 826
        $page_match = drupal_match_path($path, $pages);
819 827
        if ($path != $_GET['q']) {
820 828
          $page_match = $page_match || drupal_match_path($_GET['q'], $pages);
821 829
        }
822
        // When $block->visibility has a value of 0 (BLOCK_VISIBILITY_NOTLISTED),
823
        // the block is displayed on all pages except those listed in $block->pages.
824
        // When set to 1 (BLOCK_VISIBILITY_LISTED), it is displayed only on those
825
        // pages listed in $block->pages.
830
        // When $block->visibility has a value of 0
831
        // (BLOCK_VISIBILITY_NOTLISTED), the block is displayed on all pages
832
        // except those listed in $block->pages. When set to 1
833
        // (BLOCK_VISIBILITY_LISTED), it is displayed only on those pages
834
        // listed in $block->pages.
826 835
        $page_match = !($block->visibility xor $page_match);
827 836
      }
828 837
      elseif (module_exists('php')) {
......
845 854
 * Render the content and subject for a set of blocks.
846 855
 *
847 856
 * @param $region_blocks
848
 *   An array of block objects such as returned for one region by _block_load_blocks().
857
 *   An array of block objects such as returned for one region by
858
 *   _block_load_blocks().
849 859
 *
850 860
 * @return
851 861
 *   An array of visible blocks as expected by drupal_render().
......
953 963
 * Theme and language contexts are automatically differentiated.
954 964
 *
955 965
 * @param $block
966
 *   The block to get the cache_id from.
967
 *
956 968
 * @return
957 969
 *   The string used as cache_id for the block.
958 970
 */
drupal7/modules/block/tests/block_test.info
5 5
core = 7.x
6 6
hidden = TRUE
7 7

  
8
; Information added by Drupal.org packaging script on 2015-10-21
9
version = "7.41"
8
; Information added by Drupal.org packaging script on 2016-02-03
9
version = "7.42"
10 10
project = "drupal"
11
datestamp = "1445457729"
11
datestamp = "1454517955"
12 12

  
drupal7/modules/block/tests/themes/block_test_theme/block_test_theme.info
13 13
regions[highlighted] = Highlighted
14 14
regions[help] = Help
15 15

  
16
; Information added by Drupal.org packaging script on 2015-10-21
17
version = "7.41"
16
; Information added by Drupal.org packaging script on 2016-02-03
17
version = "7.42"
18 18
project = "drupal"
19
datestamp = "1445457729"
19
datestamp = "1454517955"
20 20

  
drupal7/modules/blog/blog.info
5 5
core = 7.x
6 6
files[] = blog.test
7 7

  
8
; Information added by Drupal.org packaging script on 2015-10-21
9
version = "7.41"
8
; Information added by Drupal.org packaging script on 2016-02-03
9
version = "7.42"
10 10
project = "drupal"
11
datestamp = "1445457729"
11
datestamp = "1454517955"
12 12

  
drupal7/modules/book/book.info
7 7
configure = admin/content/book/settings
8 8
stylesheets[all][] = book.css
9 9

  
10
; Information added by Drupal.org packaging script on 2015-10-21
11
version = "7.41"
10
; Information added by Drupal.org packaging script on 2016-02-03
11
version = "7.42"
12 12
project = "drupal"
13
datestamp = "1445457729"
13
datestamp = "1454517955"
14 14

  
drupal7/modules/color/color.info
5 5
core = 7.x
6 6
files[] = color.test
7 7

  
8
; Information added by Drupal.org packaging script on 2015-10-21
9
version = "7.41"
8
; Information added by Drupal.org packaging script on 2016-02-03
9
version = "7.42"
10 10
project = "drupal"
11
datestamp = "1445457729"
11
datestamp = "1454517955"
12 12

  
drupal7/modules/comment/comment.info
9 9
configure = admin/content/comment
10 10
stylesheets[all][] = comment.css
11 11

  
12
; Information added by Drupal.org packaging script on 2015-10-21
13
version = "7.41"
12
; Information added by Drupal.org packaging script on 2016-02-03
13
version = "7.42"
14 14
project = "drupal"
15
datestamp = "1445457729"
15
datestamp = "1454517955"
16 16

  
drupal7/modules/contact/contact.info
6 6
files[] = contact.test
7 7
configure = admin/structure/contact
8 8

  
9
; Information added by Drupal.org packaging script on 2015-10-21
10
version = "7.41"
9
; Information added by Drupal.org packaging script on 2016-02-03
10
version = "7.42"
11 11
project = "drupal"
12
datestamp = "1445457729"
12
datestamp = "1454517955"
13 13

  
drupal7/modules/contextual/contextual.info
5 5
core = 7.x
6 6
files[] = contextual.test
7 7

  
8
; Information added by Drupal.org packaging script on 2015-10-21
9
version = "7.41"
8
; Information added by Drupal.org packaging script on 2016-02-03
9
version = "7.42"
10 10
project = "drupal"
11
datestamp = "1445457729"
11
datestamp = "1454517955"
12 12

  
drupal7/modules/dashboard/dashboard.info
7 7
dependencies[] = block
8 8
configure = admin/dashboard/customize
9 9

  
10
; Information added by Drupal.org packaging script on 2015-10-21
11
version = "7.41"
10
; Information added by Drupal.org packaging script on 2016-02-03
11
version = "7.42"
12 12
project = "drupal"
13
datestamp = "1445457729"
13
datestamp = "1454517955"
14 14

  
drupal7/modules/dblog/dblog.info
5 5
core = 7.x
6 6
files[] = dblog.test
7 7

  
8
; Information added by Drupal.org packaging script on 2015-10-21
9
version = "7.41"
8
; Information added by Drupal.org packaging script on 2016-02-03
9
version = "7.42"
10 10
project = "drupal"
11
datestamp = "1445457729"
11
datestamp = "1454517955"
12 12

  
drupal7/modules/dblog/dblog.module
144 144
 * Note: Some values may be truncated to meet database column size restrictions.
145 145
 */
146 146
function dblog_watchdog(array $log_entry) {
147
  if (!function_exists('drupal_substr')) {
148
    require_once DRUPAL_ROOT . '/includes/unicode.inc';
149
  }
147 150
  Database::getConnection('default', 'default')->insert('watchdog')
148 151
    ->fields(array(
149 152
      'uid' => $log_entry['uid'],
150
      'type' => substr($log_entry['type'], 0, 64),
153
      'type' => drupal_substr($log_entry['type'], 0, 64),
151 154
      'message' => $log_entry['message'],
152 155
      'variables' => serialize($log_entry['variables']),
153 156
      'severity' => $log_entry['severity'],
154
      'link' => substr($log_entry['link'], 0, 255),
157
      'link' => drupal_substr($log_entry['link'], 0, 255),
155 158
      'location' => $log_entry['request_uri'],
156 159
      'referer' => $log_entry['referer'],
157
      'hostname' => substr($log_entry['ip'], 0, 128),
160
      'hostname' => drupal_substr($log_entry['ip'], 0, 128),
158 161
      'timestamp' => $log_entry['timestamp'],
159 162
    ))
160 163
    ->execute();
drupal7/modules/dblog/dblog.test
119 119
  private function generateLogEntries($count, $type = 'custom', $severity = WATCHDOG_NOTICE) {
120 120
    global $base_root;
121 121

  
122
    // Make it just a little bit harder to pass the link part of the test.
123
    $link = urldecode('/content/xo%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A%E9%85%B1%E5%87%89%E6%8B%8C%E7%B4%A0%E9%B8%A1%E7%85%A7%E7%83%A7%E9%B8%A1%E9%BB%84%E7%8E%AB%E7%91%B0-%E7%A7%91%E5%B7%9E%E7%9A%84%E5%B0%8F%E4%B9%9D%E5%AF%A8%E6%B2%9F%E7%BB%9D%E7%BE%8E%E9%AB%98%E5%B1%B1%E6%B9%96%E6%B3%8A-lake-isabelle');
124

  
122 125
    // Prepare the fields to be logged
123 126
    $log = array(
124 127
      'type'        => $type,
125 128
      'message'     => 'Log entry added to test the dblog row limit.',
126 129
      'variables'   => array(),
127 130
      'severity'    => $severity,
128
      'link'        => NULL,
131
      'link'        => $link,
129 132
      'user'        => $this->big_user,
130 133
      'uid'         => isset($this->big_user->uid) ? $this->big_user->uid : 0,
131 134
      'request_uri' => $base_root . request_uri(),
......
634 637
    $this->assertLink(html_entity_decode($message_text), 0, $message);
635 638
  }
636 639
}
637

  
drupal7/modules/field/field.info
11 11
required = TRUE
12 12
stylesheets[all][] = theme/field.css
13 13

  
14
; Information added by Drupal.org packaging script on 2015-10-21
15
version = "7.41"
14
; Information added by Drupal.org packaging script on 2016-02-03
15
version = "7.42"
16 16
project = "drupal"
17
datestamp = "1445457729"
17
datestamp = "1454517955"
18 18

  
drupal7/modules/field/modules/field_sql_storage/field_sql_storage.info
7 7
files[] = field_sql_storage.test
8 8
required = TRUE
9 9

  
10
; Information added by Drupal.org packaging script on 2015-10-21
11
version = "7.41"
10
; Information added by Drupal.org packaging script on 2016-02-03
11
version = "7.42"
12 12
project = "drupal"
13
datestamp = "1445457729"
13
datestamp = "1454517955"
14 14

  
drupal7/modules/field/modules/list/list.info
7 7
dependencies[] = options
8 8
files[] = tests/list.test
9 9

  
10
; Information added by Drupal.org packaging script on 2015-10-21
11
version = "7.41"
10
; Information added by Drupal.org packaging script on 2016-02-03
11
version = "7.42"
12 12
project = "drupal"
13
datestamp = "1445457729"
13
datestamp = "1454517955"
14 14

  
drupal7/modules/field/modules/list/tests/list_test.info
5 5
version = VERSION
6 6
hidden = TRUE
7 7

  
8
; Information added by Drupal.org packaging script on 2015-10-21
9
version = "7.41"
8
; Information added by Drupal.org packaging script on 2016-02-03
9
version = "7.42"
10 10
project = "drupal"
11
datestamp = "1445457729"
11
datestamp = "1454517955"
12 12

  
drupal7/modules/field/modules/number/number.info
6 6
dependencies[] = field
7 7
files[] = number.test
8 8

  
9
; Information added by Drupal.org packaging script on 2015-10-21
10
version = "7.41"
9
; Information added by Drupal.org packaging script on 2016-02-03
10
version = "7.42"
11 11
project = "drupal"
12
datestamp = "1445457729"
12
datestamp = "1454517955"
13 13

  
drupal7/modules/field/modules/options/options.info
6 6
dependencies[] = field
7 7
files[] = options.test
8 8

  
9
; Information added by Drupal.org packaging script on 2015-10-21
10
version = "7.41"
9
; Information added by Drupal.org packaging script on 2016-02-03
10
version = "7.42"
11 11
project = "drupal"
12
datestamp = "1445457729"
12
datestamp = "1454517955"
13 13

  
drupal7/modules/field/modules/options/options.module
185 185
  $base = array(
186 186
    'filter_xss' => FALSE,
187 187
    'strip_tags' => FALSE,
188
    'strip_tags_and_unescape' => FALSE,
188 189
    'empty_option' => FALSE,
189 190
    'optgroups' => FALSE,
190 191
  );
......
195 196
    case 'select':
196 197
      $properties = array(
197 198
        // Select boxes do not support any HTML tag.
198
        'strip_tags' => TRUE,
199
        'strip_tags_and_unescape' => TRUE,
199 200
        'optgroups' => TRUE,
200 201
      );
201 202
      if ($multiple) {
......
271 272
      _options_prepare_options($options[$value], $properties);
272 273
    }
273 274
    else {
275
      // The 'strip_tags' option is deprecated. Use 'strip_tags_and_unescape'
276
      // when plain text is required (and where the output will be run through
277
      // check_plain() before being inserted back into HTML) or 'filter_xss'
278
      // when HTML is required.
274 279
      if ($properties['strip_tags']) {
275 280
        $options[$value] = strip_tags($label);
276 281
      }
282
      if ($properties['strip_tags_and_unescape']) {
283
        $options[$value] = decode_entities(strip_tags($label));
284
      }
277 285
      if ($properties['filter_xss']) {
278 286
        $options[$value] = field_filter_xss($label);
279 287
      }
drupal7/modules/field/modules/options/options.test
24 24
      'cardinality' => 1,
25 25
      'settings' => array(
26 26
        // Make sure that 0 works as an option.
27
        'allowed_values' => array(0 => 'Zero', 1 => 'One', 2 => 'Some <script>dangerous</script> & unescaped <strong>markup</strong>'),
27
        'allowed_values' => array(0 => 'Zero', 1 => 'One', 2 => 'Some <script>dangerous</script> & unescaped <strong>markup</strong>',  3 => 'Some HTML encoded markup with &lt; &amp; &gt;'),
28 28
      ),
29 29
    );
30 30
    $this->card_1 = field_create_field($this->card_1);
......
233 233
    $this->assertNoOptionSelected("edit-card-1-$langcode", 1);
234 234
    $this->assertNoOptionSelected("edit-card-1-$langcode", 2);
235 235
    $this->assertRaw('Some dangerous &amp; unescaped markup', 'Option text was properly filtered.');
236
    $this->assertRaw('Some HTML encoded markup with &lt; &amp; &gt;', 'HTML entities in option text were properly handled and not double-encoded');
236 237

  
237 238
    // Submit form: select invalid 'none' option.
238 239
    $edit = array("card_1[$langcode]" => '_none');
drupal7/modules/field/modules/text/text.info
7 7
files[] = text.test
8 8
required = TRUE
9 9

  
10
; Information added by Drupal.org packaging script on 2015-10-21
11
version = "7.41"
10
; Information added by Drupal.org packaging script on 2016-02-03
11
version = "7.42"
12 12
project = "drupal"
13
datestamp = "1445457729"
13
datestamp = "1454517955"
14 14

  
drupal7/modules/field/modules/text/text.module
223 223

  
224 224
  if (strpos($display['type'], '_trimmed') !== FALSE) {
225 225
    $element['trim_length'] = array(
226
      '#title' => t('Trim length'),
226
      '#title' => t('Trimmed limit'),
227 227
      '#type' => 'textfield',
228
      '#field_suffix' => t('characters'),
228 229
      '#size' => 10,
229 230
      '#default_value' => $settings['trim_length'],
230 231
      '#element_validate' => array('element_validate_integer_positive'),
232
      '#description' => t('If the summary is not set, the trimmed %label field will be shorter than this character limit.', array('%label' => $instance['label'])),
231 233
      '#required' => TRUE,
232 234
    );
233 235
  }
......
245 247
  $summary = '';
246 248

  
247 249
  if (strpos($display['type'], '_trimmed') !== FALSE) {
248
    $summary = t('Trim length') . ': ' . check_plain($settings['trim_length']);
250
    $summary = t('Trimmed limit: @trim_length characters', array('@trim_length' => $settings['trim_length']));
249 251
  }
250 252

  
251 253
  return $summary;
drupal7/modules/field/tests/field_test.info
6 6
version = VERSION
7 7
hidden = TRUE
8 8

  
9
; Information added by Drupal.org packaging script on 2015-10-21
10
version = "7.41"
9
; Information added by Drupal.org packaging script on 2016-02-03
10
version = "7.42"
11 11
project = "drupal"
12
datestamp = "1445457729"
12
datestamp = "1454517955"
13 13

  
drupal7/modules/field_ui/field_ui.info
6 6
dependencies[] = field
7 7
files[] = field_ui.test
8 8

  
9
; Information added by Drupal.org packaging script on 2015-10-21
10
version = "7.41"
9
; Information added by Drupal.org packaging script on 2016-02-03
10
version = "7.42"
11 11
project = "drupal"
12
datestamp = "1445457729"
12
datestamp = "1454517955"
13 13

  
drupal7/modules/file/file.info
6 6
dependencies[] = field
7 7
files[] = tests/file.test
8 8

  
9
; Information added by Drupal.org packaging script on 2015-10-21
10
version = "7.41"
9
; Information added by Drupal.org packaging script on 2016-02-03
10
version = "7.42"
11 11
project = "drupal"
12
datestamp = "1445457729"
12
datestamp = "1454517955"
13 13

  
drupal7/modules/file/tests/file_module_test.info
5 5
core = 7.x
6 6
hidden = TRUE
7 7

  
8
; Information added by Drupal.org packaging script on 2015-10-21
9
version = "7.41"
8
; Information added by Drupal.org packaging script on 2016-02-03
9
version = "7.42"
10 10
project = "drupal"
11
datestamp = "1445457729"
11
datestamp = "1454517955"
12 12

  
drupal7/modules/filter/filter.info
7 7
required = TRUE
8 8
configure = admin/config/content/formats
9 9

  
10
; Information added by Drupal.org packaging script on 2015-10-21
11
version = "7.41"
10
; Information added by Drupal.org packaging script on 2016-02-03
11
version = "7.42"
12 12
project = "drupal"
13
datestamp = "1445457729"
13
datestamp = "1454517955"
14 14

  
drupal7/modules/forum/forum.info
9 9
configure = admin/structure/forum
10 10
stylesheets[all][] = forum.css
11 11

  
12
; Information added by Drupal.org packaging script on 2015-10-21
13
version = "7.41"
12
; Information added by Drupal.org packaging script on 2016-02-03
13
version = "7.42"
14 14
project = "drupal"
15
datestamp = "1445457729"
15
datestamp = "1454517955"
16 16

  
drupal7/modules/help/help.info
5 5
core = 7.x
6 6
files[] = help.test
7 7

  
8
; Information added by Drupal.org packaging script on 2015-10-21
9
version = "7.41"
8
; Information added by Drupal.org packaging script on 2016-02-03
9
version = "7.42"
10 10
project = "drupal"
11
datestamp = "1445457729"
11
datestamp = "1454517955"
12 12

  
drupal7/modules/image/image.info
7 7
files[] = image.test
8 8
configure = admin/config/media/image-styles
9 9

  
10
; Information added by Drupal.org packaging script on 2015-10-21
11
version = "7.41"
10
; Information added by Drupal.org packaging script on 2016-02-03
11
version = "7.42"
12 12
project = "drupal"
13
datestamp = "1445457729"
13
datestamp = "1454517955"
14 14

  
drupal7/modules/image/image.module
835 835
      file_download($scheme, file_uri_target($derivative_uri));
836 836
    }
837 837
    else {
838
      $headers = module_invoke_all('file_download', $image_uri);
839
      if (in_array(-1, $headers) || empty($headers)) {
838
      $headers = file_download_headers($image_uri);
839
      if (empty($headers)) {
840 840
        return MENU_ACCESS_DENIED;
841 841
      }
842 842
      if (count($headers)) {
drupal7/modules/image/image.test
201 201
    $this->assertResponse(404, 'Accessing an image style URL with a source image that does not exist provides a 404 error response.');
202 202
  }
203 203

  
204
  /**
205
   * Test that we do not pass an array to drupal_add_http_header.
206
   */
207
  function testImageContentTypeHeaders() {
208
    $files = $this->drupalGetTestFiles('image');
209
    $file = array_shift($files);
210
    // Copy the test file to private folder.
211
    $private_file = file_copy($file, 'private://', FILE_EXISTS_RENAME);
212
    // Tell image_module_test module to return the headers we want to test.
213
    variable_set('image_module_test_invalid_headers', $private_file->uri);
214
    // Invoke image_style_deliver so it will try to set headers.
215
    $generated_url = image_style_url($this->style_name, $private_file->uri);
216
    $this->drupalGet($generated_url);
217
    variable_del('image_module_test_invalid_headers');
218
  }
219

  
204 220
  /**
205 221
   * Test image_style_url().
206 222
   */
drupal7/modules/image/tests/image_module_test.info
6 6
files[] = image_module_test.module
7 7
hidden = TRUE
8 8

  
9
; Information added by Drupal.org packaging script on 2015-10-21
10
version = "7.41"
9
; Information added by Drupal.org packaging script on 2016-02-03
10
version = "7.42"
11 11
project = "drupal"
12
datestamp = "1445457729"
12
datestamp = "1454517955"
13 13

  
drupal7/modules/image/tests/image_module_test.module
9 9
  if (variable_get('image_module_test_file_download', FALSE) == $uri) {
10 10
    return array('X-Image-Owned-By' => 'image_module_test');
11 11
  }
12
  if (variable_get('image_module_test_invalid_headers', FALSE) == $uri) {
13
    return array('Content-Type' => 'image/png');
14
  }
12 15
}
13 16

  
14 17
/**
drupal7/modules/locale/locale.info
6 6
files[] = locale.test
7 7
configure = admin/config/regional/language
8 8

  
9
; Information added by Drupal.org packaging script on 2015-10-21
10
version = "7.41"
9
; Information added by Drupal.org packaging script on 2016-02-03
10
version = "7.42"
11 11
project = "drupal"
12
datestamp = "1445457729"
12
datestamp = "1454517955"
13 13

  
drupal7/modules/locale/tests/locale_test.info
5 5
version = VERSION
6 6
hidden = TRUE
7 7

  
8
; Information added by Drupal.org packaging script on 2015-10-21
9
version = "7.41"
8
; Information added by Drupal.org packaging script on 2016-02-03
9
version = "7.42"
10 10
project = "drupal"
11
datestamp = "1445457729"
11
datestamp = "1454517955"
12 12

  
drupal7/modules/menu/menu.info
6 6
files[] = menu.test
7 7
configure = admin/structure/menu
8 8

  
9
; Information added by Drupal.org packaging script on 2015-10-21
10
version = "7.41"
9
; Information added by Drupal.org packaging script on 2016-02-03
10
version = "7.42"
11 11
project = "drupal"
12
datestamp = "1445457729"
12
datestamp = "1454517955"
13 13

  
drupal7/modules/node/node.admin.inc
508 508
  $options = array();
509 509
  foreach ($nodes as $node) {
510 510
    $langcode = entity_language('node', $node);
511
    $l_options = $langcode != LANGUAGE_NONE && isset($languages[$langcode]) ? array('language' => $languages[$langcode]) : array();
511
    $uri = entity_uri('node', $node);
512
    if ($langcode != LANGUAGE_NONE && isset($languages[$langcode])) {
513
      $uri['options']['language'] = $languages[$langcode];
514
    }
512 515
    $options[$node->nid] = array(
513 516
      'title' => array(
514 517
        'data' => array(
515 518
          '#type' => 'link',
516 519
          '#title' => $node->title,
517
          '#href' => 'node/' . $node->nid,
518
          '#options' => $l_options,
520
          '#href' => $uri['path'],
521
          '#options' => $uri['options'],
519 522
          '#suffix' => ' ' . theme('mark', array('type' => node_mark($node->nid, $node->changed))),
520 523
        ),
521 524
      ),
drupal7/modules/node/node.info
9 9
configure = admin/structure/types
10 10
stylesheets[all][] = node.css
11 11

  
12
; Information added by Drupal.org packaging script on 2015-10-21
13
version = "7.41"
12
; Information added by Drupal.org packaging script on 2016-02-03
13
version = "7.42"
14 14
project = "drupal"
15
datestamp = "1445457729"
15
datestamp = "1454517955"
16 16

  
drupal7/modules/node/node.module
2953 2953
 * system. When adding a node listing to your module, be sure to use a dynamic
2954 2954
 * query created by db_select() and add a tag of "node_access". This will allow
2955 2955
 * modules dealing with node access to ensure only nodes to which the user has
2956
 * access are retrieved, through the use of hook_query_TAG_alter().
2956
 * access are retrieved, through the use of hook_query_TAG_alter(). Tagging a
2957
 * query with "node_access" does not check the published/unpublished status of
2958
 * nodes, so the base query is responsible for ensuring that unpublished nodes
2959
 * are not displayed to inappropriate users.
2957 2960
 *
2958 2961
 * Note: Even a single module returning NODE_ACCESS_DENY from hook_node_access()
2959 2962
 * will block access to the node. Therefore, implementers should take care to
......
3685 3688
    // Initiate multistep processing.
3686 3689
    $context['sandbox']['progress'] = 0;
3687 3690
    $context['sandbox']['current_node'] = 0;
3688
    $context['sandbox']['max'] = db_query('SELECT COUNT(DISTINCT nid) FROM {node}')->fetchField();
3691
    $context['sandbox']['max'] = db_query('SELECT COUNT(nid) FROM {node}')->fetchField();
3689 3692
  }
3690 3693

  
3691 3694
  // Process the next 20 nodes.
drupal7/modules/node/node.pages.inc
396 396

  
397 397
    $cloned_node->changed = REQUEST_TIME;
398 398
    $nodes = array($cloned_node->nid => $cloned_node);
399
    field_attach_prepare_view('node', $nodes, 'full');
400 399

  
401 400
    // Display a preview of the node.
402 401
    if (!form_get_errors()) {
drupal7/modules/node/node.test
457 457
  }
458 458

  
459 459
  function setUp() {
460
    parent::setUp();
460
    parent::setUp(array('taxonomy', 'node'));
461 461

  
462 462
    $web_user = $this->drupalCreateUser(array('edit own page content', 'create page content'));
463 463
    $this->drupalLogin($web_user);
464

  
465
    // Add a vocabulary so we can test different view modes.
466
    $vocabulary = (object) array(
467
      'name' => $this->randomName(),
468
      'description' => $this->randomName(),
469
      'machine_name' => drupal_strtolower($this->randomName()),
470
      'help' => '',
471
      'nodes' => array('page' => 'page'),
472
    );
473
    taxonomy_vocabulary_save($vocabulary);
474

  
475
    $this->vocabulary = $vocabulary;
476

  
477
    // Add a term to the vocabulary.
478
    $term = (object) array(
479
      'name' => $this->randomName(),
480
      'description' => $this->randomName(),
481
      // Use the first available text format.
482
      'format' => db_query_range('SELECT format FROM {filter_format}', 0, 1)->fetchField(),
483
      'vid' => $this->vocabulary->vid,
484
      'vocabulary_machine_name' => $vocabulary->machine_name,
485
    );
486
    taxonomy_term_save($term);
487

  
488
    $this->term = $term;
489

  
490
    // Set up a field and instance.
491
    $this->field_name = drupal_strtolower($this->randomName());
492
    $this->field = array(
493
      'field_name' => $this->field_name,
494
      'type' => 'taxonomy_term_reference',
495
      'settings' => array(
496
        'allowed_values' => array(
497
          array(
498
            'vocabulary' => $this->vocabulary->machine_name,
499
            'parent' => '0',
500
          ),
501
        ),
502
      )
503
    );
504

  
505
    field_create_field($this->field);
506
    $this->instance = array(
507
      'field_name' => $this->field_name,
508
      'entity_type' => 'node',
509
      'bundle' => 'page',
510
      'widget' => array(
511
        'type' => 'options_select',
512
      ),
513
      // Hide on full display but render on teaser.
514
      'display' => array(
515
        'default' => array(
516
          'type' => 'hidden',
517
        ),
518
        'teaser' => array(
519
          'type' => 'taxonomy_term_reference_link',
520
        ),
521
      ),
522
    );
523
    field_create_instance($this->instance);
464 524
  }
465 525

  
466 526
  /**
......
470 530
    $langcode = LANGUAGE_NONE;
471 531
    $title_key = "title";
472 532
    $body_key = "body[$langcode][0][value]";
533
    $term_key = "{$this->field_name}[$langcode]";
473 534

  
474 535
    // Fill in node creation form and preview node.
475 536
    $edit = array();
476 537
    $edit[$title_key] = $this->randomName(8);
477 538
    $edit[$body_key] = $this->randomName(16);
539
    $edit[$term_key] = $this->term->tid;
478 540
    $this->drupalPost('node/add/page', $edit, t('Preview'));
479 541

  
480
    // Check that the preview is displaying the title and body.
542
    // Check that the preview is displaying the title, body, and term.
481 543
    $this->assertTitle(t('Preview | Drupal'), 'Basic page title is preview.');
482 544
    $this->assertText($edit[$title_key], 'Title displayed.');
483 545
    $this->assertText($edit[$body_key], 'Body displayed.');
546
    $this->assertText($this->term->name, 'Term displayed.');
484 547

  
485
    // Check that the title and body fields are displayed with the correct values.
548
    // Check that the title, body, and term fields are displayed with the
549
    // correct values.
486 550
    $this->assertFieldByName($title_key, $edit[$title_key], 'Title field displayed.');
487 551
    $this->assertFieldByName($body_key, $edit[$body_key], 'Body field displayed.');
552
    $this->assertFieldByName($term_key, $edit[$term_key], 'Term field displayed.');
488 553
  }
489 554

  
490 555
  /**
......
494 559
    $langcode = LANGUAGE_NONE;
495 560
    $title_key = "title";
496 561
    $body_key = "body[$langcode][0][value]";
562
    $term_key = "{$this->field_name}[$langcode]";
497 563
    // Force revision on "Basic page" content.
498 564
    variable_set('node_options_page', array('status', 'revision'));
499 565

  
......
501 567
    $edit = array();
502 568
    $edit[$title_key] = $this->randomName(8);
503 569
    $edit[$body_key] = $this->randomName(16);
570
    $edit[$term_key] = $this->term->tid;
504 571
    $edit['log'] = $this->randomName(32);
505 572
    $this->drupalPost('node/add/page', $edit, t('Preview'));
506 573

  
507
    // Check that the preview is displaying the title and body.
574
    // Check that the preview is displaying the title, body, and term.
508 575
    $this->assertTitle(t('Preview | Drupal'), 'Basic page title is preview.');
509 576
    $this->assertText($edit[$title_key], 'Title displayed.');
510 577
    $this->assertText($edit[$body_key], 'Body displayed.');
578
    $this->assertText($this->term->name, 'Term displayed.');
511 579

  
512
    // Check that the title and body fields are displayed with the correct values.
580
    // Check that the title, body, and term fields are displayed with the
581
    // correct values.
513 582
    $this->assertFieldByName($title_key, $edit[$title_key], 'Title field displayed.');
514 583
    $this->assertFieldByName($body_key, $edit[$body_key], 'Body field displayed.');
584
    $this->assertFieldByName($term_key, $edit[$term_key], 'Term field displayed.');
515 585

  
516 586
    // Check that the log field has the correct value.
517 587
    $this->assertFieldByName('log', $edit['log'], 'Log field displayed.');
drupal7/modules/node/tests/node_access_test.info
5 5
core = 7.x
6 6
hidden = TRUE
7 7

  
8
; Information added by Drupal.org packaging script on 2015-10-21
9
version = "7.41"
8
; Information added by Drupal.org packaging script on 2016-02-03
9
version = "7.42"
10 10
project = "drupal"
11
datestamp = "1445457729"
11
datestamp = "1454517955"
12 12

  
drupal7/modules/node/tests/node_test.info
5 5
core = 7.x
6 6
hidden = TRUE
7 7

  
8
; Information added by Drupal.org packaging script on 2015-10-21
9
version = "7.41"
8
; Information added by Drupal.org packaging script on 2016-02-03
9
version = "7.42"
10 10
project = "drupal"
11
datestamp = "1445457729"
11
datestamp = "1454517955"
12 12

  
drupal7/modules/node/tests/node_test_exception.info
5 5
core = 7.x
6 6
hidden = TRUE
7 7

  
8
; Information added by Drupal.org packaging script on 2015-10-21
9
version = "7.41"
8
; Information added by Drupal.org packaging script on 2016-02-03
9
version = "7.42"
10 10
project = "drupal"
11
datestamp = "1445457729"
11
datestamp = "1454517955"
12 12

  
drupal7/modules/openid/openid.info
5 5
core = 7.x
6 6
files[] = openid.test
7 7

  
8
; Information added by Drupal.org packaging script on 2015-10-21
9
version = "7.41"
8
; Information added by Drupal.org packaging script on 2016-02-03
9
version = "7.42"
10 10
project = "drupal"
11
datestamp = "1445457729"
11
datestamp = "1454517955"
12 12

  
drupal7/modules/openid/tests/openid_test.info
6 6
dependencies[] = openid
7 7
hidden = TRUE
8 8

  
9
; Information added by Drupal.org packaging script on 2015-10-21
10
version = "7.41"
9
; Information added by Drupal.org packaging script on 2016-02-03
10
version = "7.42"
11 11
project = "drupal"
12
datestamp = "1445457729"
12
datestamp = "1454517955"
13 13

  
drupal7/modules/overlay/overlay.info
4 4
version = VERSION
5 5
core = 7.x
6 6

  
7
; Information added by Drupal.org packaging script on 2015-10-21
8
version = "7.41"
7
; Information added by Drupal.org packaging script on 2016-02-03
8
version = "7.42"
9 9
project = "drupal"
10
datestamp = "1445457729"
10
datestamp = "1454517955"
11 11

  
drupal7/modules/path/path.info
6 6
files[] = path.test
7 7
configure = admin/config/search/path
8 8

  
9
; Information added by Drupal.org packaging script on 2015-10-21
10
version = "7.41"
9
; Information added by Drupal.org packaging script on 2016-02-03
10
version = "7.42"
11 11
project = "drupal"
12
datestamp = "1445457729"
12
datestamp = "1454517955"
13 13

  
drupal7/modules/php/php.info
5 5
core = 7.x
6 6
files[] = php.test
7 7

  
8
; Information added by Drupal.org packaging script on 2015-10-21
9
version = "7.41"
8
; Information added by Drupal.org packaging script on 2016-02-03
9
version = "7.42"
10 10
project = "drupal"
11
datestamp = "1445457729"
11
datestamp = "1454517955"
12 12

  
drupal7/modules/poll/poll.info
6 6
files[] = poll.test
7 7
stylesheets[all][] = poll.css
8 8

  
9
; Information added by Drupal.org packaging script on 2015-10-21
10
version = "7.41"
9
; Information added by Drupal.org packaging script on 2016-02-03
10
version = "7.42"
11 11
project = "drupal"
12
datestamp = "1445457729"
12
datestamp = "1454517955"
13 13

  
drupal7/modules/poll/poll.module
631 631
 *   The node object to load.
632 632
 */
633 633
function poll_block_latest_poll_view($node) {
634
  global $user;
635
  $output = '';
636

  
637 634
  // This is necessary for shared objects because PHP doesn't copy objects, but
638 635
  // passes them by reference.  So when the objects are cached it can result in
639 636
  // the wrong output being displayed on subsequent calls.  The cloning and
......
674 671
 * Implements hook_view().
675 672
 */
676 673
function poll_view($node, $view_mode) {
677
  global $user;
678
  $output = '';
679

  
680 674
  if (!empty($node->allowvotes) && empty($node->show_results)) {
681 675
    $node->content['poll_view_voting'] = drupal_get_form('poll_view_voting', $node);
682 676
  }
......
694 688
function poll_teaser($node) {
695 689
  $teaser = NULL;
696 690
  if (is_array($node->choice)) {
697
    foreach ($node->choice as $k => $choice) {
691
    foreach ($node->choice as $choice) {
698 692
      if ($choice['chtext'] != '') {
699 693
        $teaser .= '* ' . check_plain($choice['chtext']) . "\n";
700 694
      }
... Ce différentiel a été tronqué car il excède la taille maximale pouvant être affichée.

Formats disponibles : Unified diff