Skip to content
Snippets Groups Projects
Commit bad64c04 authored by catch's avatar catch
Browse files

Issue #3439711 by nicxvan: Remove deprecated country call from 11.x

parent 04065367
No related branches found
No related tags found
27 merge requests!11131[10.4.x-only-DO-NOT-MERGE]: Issue ##2842525 Ajax attached to Views exposed filter form does not trigger callbacks,!9470[10.3.x-only-DO-NOT-MERGE]: #3331771 Fix file_get_contents(): Passing null to parameter,!8540Issue #3457061: Bootstrap Modal dialog Not closing after 10.3.0 Update,!8528Issue #3456871 by Tim Bozeman: Support NULL services,!8373Issue #3427374 by danflanagan8, Vighneshh: taxonomy_tid ViewsArgumentDefault...,!7526Expose roles in response,!3878Removed unused condition head title for views,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3133core/modules/system/css/components/hidden.module.css,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2794Issue #3100732: Allow specifying `meta` data on JSON:API objects,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2062Issue #3246454: Add weekly granularity to views date sort,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!877Issue #2708101: Default value for link text is not saved,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493
Pipeline #142114 canceled
Pipeline: drupal

#142116

    ...@@ -53,7 +53,6 @@ class DateFormatter implements DateFormatterInterface { ...@@ -53,7 +53,6 @@ class DateFormatter implements DateFormatterInterface {
    */ */
    protected $requestStack; protected $requestStack;
    protected $country = NULL;
    protected $dateFormats = []; protected $dateFormats = [];
    /** /**
    ...@@ -341,22 +340,4 @@ protected function dateFormat($type, $langcode) { ...@@ -341,22 +340,4 @@ protected function dateFormat($type, $langcode) {
    return $this->dateFormats[$type][$langcode]; return $this->dateFormats[$type][$langcode];
    } }
    /**
    * Returns the default country from config.
    *
    * @return string
    * The config setting for country.default.
    *
    * @deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There will be a contrib replacement. See https://www.drupal.org/node/3439484
    *
    * @see https://www.drupal.org/node/3439484
    */
    protected function country() {
    @trigger_error('Calling ' . __METHOD__ . '() is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3439484', E_USER_DEPRECATED);
    if ($this->country === NULL) {
    $this->country = \Drupal::config('system.date')->get('country.default');
    }
    return $this->country;
    }
    } }
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment