Commit 5981cc85 authored by Greg Dunlap's avatar Greg Dunlap
Browse files

Merge remote-tracking branch 'origin/8.x' into 8.x-file-config

parents 01dbc00f 26394bec

core/MAINTAINERS.txt

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ PHP module 
- ?



Poll module

- ?

- Andrei Mateescu 'amateescu' <http://drupal.org/user/729614>



RDF module

- Stéphane Corlosquet 'scor' <http://drupal.org/user/52142>

core/includes/common.inc

+13 −8
Original line number Diff line number Diff line
@@ -2967,6 +2967,18 @@ function drupal_get_css($css = NULL, $skip_alter = FALSE) { 
  // Sort CSS items, so that they appear in the correct order.

  uasort($css, 'drupal_sort_css_js');



  // Provide the page with information about the individual CSS files used,

  // information not otherwise available when CSS aggregation is enabled. The

  // setting is attached later in this function, but is set here, so that CSS

  // files removed below are still considered "used" and prevented from being

  // added in a later AJAX request.

  // Skip if no files were added to the page or jQuery.extend() will overwrite

  // the Drupal.settings.ajaxPageState.css object with an empty array.

  if (!empty($css)) {

    // Cast the array to an object to be on the safe side even if not empty.

    $setting['ajaxPageState']['css'] = (object) array_fill_keys(array_keys($css), 1);

  }



  // Remove the overridden CSS files. Later CSS files override former ones.

  $previous_item = array();

  foreach ($css as $key => $item) {
@@ -2986,14 +2998,7 @@ function drupal_get_css($css = NULL, $skip_alter = FALSE) { 
    '#type' => 'styles',

    '#items' => $css,

  );



  // Provide the page with information about the individual CSS files used,

  // information not otherwise available when CSS aggregation is enabled.

  // Skip if no files were added to the page or jQuery.extend() will overwrite

  // the Drupal.settings.ajaxPageState.css object with an empty array.

  // Cast the array to an object to be on the safe side even if not empty.

  if (!empty($css)) {

    $setting['ajaxPageState']['css'] = (object) array_fill_keys(array_keys($css), 1);

  if (!empty($setting)) {

    $styles['#attached']['js'][] = array('type' => 'setting', 'data' => $setting);

  }

core/includes/theme.inc

+7 −0
Original line number Diff line number Diff line
@@ -1035,6 +1035,13 @@ function theme($hook, $variables = array()) { 
  if (isset($info['base hook'])) {

    $base_hook = $info['base hook'];

    $base_hook_info = $hooks[$base_hook];

    // Include files required by the base hook, since its variable processors

    // might reside there.

    if (!empty($base_hook_info['includes'])) {

      foreach ($base_hook_info['includes'] as $include_file) {

        include_once DRUPAL_ROOT . '/' . $include_file;

      }

    }

    if (isset($base_hook_info['preprocess functions']) || isset($base_hook_info['process functions'])) {

      $variables['theme_hook_suggestion'] = $hook;

      $hook = $base_hook;

core/includes/unicode.inc

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
  '\x{A836}-\x{A839}\x{A874}-\x{A877}\x{A8CE}-\x{A8CF}\x{A8F8}-\x{A8FA}' .

  '\x{A92E}-\x{A92F}\x{A95F}\x{A9C1}-\x{A9CD}\x{A9DE}-\x{A9DF}' .

  '\x{AA5C}-\x{AA5F}\x{AA77}-\x{AA79}\x{AADE}-\x{AADF}\x{ABEB}' .

  '\x{D800}-\x{F8FF}\x{FB29}\x{FD3E}-\x{FD3F}\x{FDFC}-\x{FDFD}' .

  '\x{E000}-\x{F8FF}\x{FB29}\x{FD3E}-\x{FD3F}\x{FDFC}-\x{FDFD}' .

  '\x{FE10}-\x{FE19}\x{FE30}-\x{FE6B}\x{FEFF}-\x{FF0F}\x{FF1A}-\x{FF20}' .

  '\x{FF3B}-\x{FF40}\x{FF5B}-\x{FF65}\x{FFE0}-\x{FFFD}');

core/misc/machine-name.js

+5 −3
Original line number Diff line number Diff line
@@ -77,9 +77,11 @@ Drupal.behaviors.machineName = { 
        $source.bind('keyup.machineName change.machineName', function () {

          machine = self.transliterate($(this).val(), options);

          // Set the machine name to the transliterated value.

          if (machine != options.replace && machine != '') {

          if (machine != '') {

            if (machine != options.replace) {

              $target.val(machine);

              $preview.text(machine);

            }

            $suffix.show();

          }

          else {