Merge branch 'develop'

Drupal-FR · Jan 21, 2017 · 5518508 · 5518508
2 parents 3743903 + ea0b939
commit 5518508
Show file tree

Hide file tree

Showing 464 changed files with 25,490 additions and 9,903 deletions.
diff --git a/www7/includes/bootstrap.inc b/www7/includes/bootstrap.inc
@@ -8,7 +8,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '7.51');
+define('VERSION', '7.53');
 
 /**
  * Core API compatibility.

diff --git a/www7/includes/database/select.inc b/www7/includes/database/select.inc
@@ -1231,6 +1231,21 @@ class SelectQuery extends Query implements SelectQueryInterface {
 
     // Modules may alter all queries or only those having a particular tag.
     if (isset($this->alterTags)) {
+      // Many contrib modules assume that query tags used for access-checking
+      // purposes follow the pattern $entity_type . '_access'. But this is
+      // not the case for taxonomy terms, since core used to add term_access
+      // instead of taxonomy_term_access to its queries. Provide backwards
+      // compatibility by adding both tags here instead of attempting to fix
+      // all contrib modules in a coordinated effort.
+      // TODO:
+      // - Extract this mechanism into a hook as part of a public (non-security)
+      //   issue.
+      // - Emit E_USER_DEPRECATED if term_access is used.
+      //   https://www.drupal.org/node/2575081
+      $term_access_tags = array('term_access' => 1, 'taxonomy_term_access' => 1);
+      if (array_intersect_key($this->alterTags, $term_access_tags)) {
+        $this->alterTags += $term_access_tags;
+      }
       $hooks = array('query');
       foreach ($this->alterTags as $tag => $value) {
         $hooks[] = 'query_' . $tag;

diff --git a/www7/misc/tabledrag.js b/www7/misc/tabledrag.js
@@ -580,12 +580,20 @@ Drupal.tableDrag.prototype.dropRow = function (event, self) {
  * Get the mouse coordinates from the event (allowing for browser differences).
  */
 Drupal.tableDrag.prototype.mouseCoords = function (event) {
+  // Complete support for pointer events was only introduced to jQuery in
+  // version 1.11.1; between versions 1.7 and 1.11.0 pointer events have the
+  // clientX and clientY properties undefined. In those cases, the properties
+  // must be retrieved from the event.originalEvent object instead.
+  var clientX = event.clientX || event.originalEvent.clientX;
+  var clientY = event.clientY || event.originalEvent.clientY;
+
   if (event.pageX || event.pageY) {
     return { x: event.pageX, y: event.pageY };
   }
+
   return {
-    x: event.clientX + document.body.scrollLeft - document.body.clientLeft,
-    y: event.clientY + document.body.scrollTop  - document.body.clientTop
+    x: clientX + document.body.scrollLeft - document.body.clientLeft,
+    y: clientY + document.body.scrollTop  - document.body.clientTop
   };
 };
 

diff --git a/www7/modules/aggregator/aggregator.info b/www7/modules/aggregator/aggregator.info
@@ -7,8 +7,8 @@ files[] = aggregator.test
 configure = admin/config/services/aggregator/settings
 stylesheets[all][] = aggregator.css
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/aggregator/tests/aggregator_test.info b/www7/modules/aggregator/tests/aggregator_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/block/block.info b/www7/modules/block/block.info
@@ -6,8 +6,8 @@ core = 7.x
 files[] = block.test
 configure = admin/structure/block
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/block/tests/block_test.info b/www7/modules/block/tests/block_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/block/tests/themes/block_test_theme/block_test_theme.info b/www7/modules/block/tests/themes/block_test_theme/block_test_theme.info
@@ -13,8 +13,8 @@ regions[footer] = Footer
 regions[highlighted] = Highlighted
 regions[help] = Help
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/blog/blog.info b/www7/modules/blog/blog.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = blog.test
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/book/book.info b/www7/modules/book/book.info
@@ -7,8 +7,8 @@ files[] = book.test
 configure = admin/content/book/settings
 stylesheets[all][] = book.css
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/color/color.info b/www7/modules/color/color.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = color.test
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/comment/comment.info b/www7/modules/comment/comment.info
@@ -9,8 +9,8 @@ files[] = comment.test
 configure = admin/content/comment
 stylesheets[all][] = comment.css
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/contact/contact.info b/www7/modules/contact/contact.info
@@ -6,8 +6,8 @@ core = 7.x
 files[] = contact.test
 configure = admin/structure/contact
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/contextual/contextual.info b/www7/modules/contextual/contextual.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = contextual.test
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/dashboard/dashboard.info b/www7/modules/dashboard/dashboard.info
@@ -7,8 +7,8 @@ files[] = dashboard.test
 dependencies[] = block
 configure = admin/dashboard/customize
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/dblog/dblog.info b/www7/modules/dblog/dblog.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = dblog.test
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/field/field.info b/www7/modules/field/field.info
@@ -11,8 +11,8 @@ dependencies[] = field_sql_storage
 required = TRUE
 stylesheets[all][] = theme/field.css
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/field/modules/field_sql_storage/field_sql_storage.info b/www7/modules/field/modules/field_sql_storage/field_sql_storage.info
@@ -7,8 +7,8 @@ dependencies[] = field
 files[] = field_sql_storage.test
 required = TRUE
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/field/modules/list/list.info b/www7/modules/field/modules/list/list.info
@@ -7,8 +7,8 @@ dependencies[] = field
 dependencies[] = options
 files[] = tests/list.test
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/field/modules/list/tests/list_test.info b/www7/modules/field/modules/list/tests/list_test.info
@@ -5,8 +5,8 @@ package = Testing
 version = VERSION
 hidden = TRUE
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/field/modules/number/number.info b/www7/modules/field/modules/number/number.info
@@ -6,8 +6,8 @@ core = 7.x
 dependencies[] = field
 files[] = number.test
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/field/modules/options/options.info b/www7/modules/field/modules/options/options.info
@@ -6,8 +6,8 @@ core = 7.x
 dependencies[] = field
 files[] = options.test
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/field/modules/text/text.info b/www7/modules/field/modules/text/text.info
@@ -7,8 +7,8 @@ dependencies[] = field
 files[] = text.test
 required = TRUE
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/field/tests/field_test.info b/www7/modules/field/tests/field_test.info
@@ -6,8 +6,8 @@ files[] = field_test.entity.inc
 version = VERSION
 hidden = TRUE
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/field_ui/field_ui.info b/www7/modules/field_ui/field_ui.info
@@ -6,8 +6,8 @@ core = 7.x
 dependencies[] = field
 files[] = field_ui.test
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/file/file.info b/www7/modules/file/file.info
@@ -6,8 +6,8 @@ core = 7.x
 dependencies[] = field
 files[] = tests/file.test
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/file/tests/file_module_test.info b/www7/modules/file/tests/file_module_test.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 hidden = TRUE
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/filter/filter.info b/www7/modules/filter/filter.info
@@ -7,8 +7,8 @@ files[] = filter.test
 required = TRUE
 configure = admin/config/content/formats
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/forum/forum.info b/www7/modules/forum/forum.info
@@ -9,8 +9,8 @@ files[] = forum.test
 configure = admin/structure/forum
 stylesheets[all][] = forum.css
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/help/help.info b/www7/modules/help/help.info
@@ -5,8 +5,8 @@ version = VERSION
 core = 7.x
 files[] = help.test
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"
 
diff --git a/www7/modules/image/image.info b/www7/modules/image/image.info
@@ -7,8 +7,8 @@ dependencies[] = file
 files[] = image.test
 configure = admin/config/media/image-styles
 
-; Information added by Drupal.org packaging script on 2016-10-05
-version = "7.51"
+; Information added by Drupal.org packaging script on 2016-12-07
+version = "7.53"
 project = "drupal"
-datestamp = "1475694174"
+datestamp = "1481152423"