Merge pull request #2996 from ec-europa/release-2.6.17

Release 2.6.17
ec-europa · Aug 3, 2021 · d815cda · d815cda
2 parents c23964c + cfc9168
commit d815cda
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/phpcs-ruleset.xml b/phpcs-ruleset.xml
@@ -56,7 +56,7 @@
         <exclude-pattern>profiles/common/modules/custom/nexteuropa_dgt_connector/tmgmt_poetry/tmgmt_poetry.module</exclude-pattern>
         <exclude-pattern>profiles/common/modules/custom/nexteuropa_dgt_connector/tmgmt_poetry/inc/tmgmt_poetry.webservice.inc</exclude-pattern>
     </rule>
-
+    
     <!-- Tmgmt poetry tests not strictly follow Drupal class name conventions. -->
     <rule ref="Drupal.NamingConventions.ValidClassName">
         <exclude-pattern>profiles/common/modules/custom/nexteuropa_dgt_connector/tmgmt_poetry/tests/tmgmt_poetry.test</exclude-pattern>

diff --git a/profiles/common/modules/features/nexteuropa_geofield/nexteuropa_geofield.module b/profiles/common/modules/features/nexteuropa_geofield/nexteuropa_geofield.module
@@ -451,8 +451,9 @@ function _nexteuropa_geofield_geocode($form, $form_state) {
       $error = $geocode->error;
     }
     else {
-      $geocode_decoded = drupal_json_decode($geocode->data);
-
+      // @codingStandardsIgnoreStart.
+      $geocode_decoded = json_decode($geocode->data, FALSE);
+      // @codingStandardsIgnoreEnd
       if ($geocode_decoded->geocodingRequestsCollection[0]->foundCount < 1) {
         $error = t('No address found.');
       }

diff --git a/resources/drupal-core.make b/resources/drupal-core.make
@@ -2,7 +2,7 @@ api = 2
 core = 7.x
 
 projects[drupal][type] = "core"
-projects[drupal][version] = "7.81"
+projects[drupal][version] = "7.82"
 
 ; AJAX callbacks not properly working with the language url suffix.
 ; https://webgate.ec.europa.eu/CITnet/jira/browse/MULTISITE-4268