Changeset 6675

Timestamp:

02/17/2018 11:57:44 AM (7 years ago)

Author:

ocean90

Message:

Locale Detection: Use class constants for the names of the GET parameter and cookie.

See #1673.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/locale-detection/class-detector.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/locale-detection/class-detector.php

@@ -14 +14 @@
 
     /**
+     * Name of the cookie for the locale.
+     */
+    const COOKIE_NAME = 'wporg_locale';
+
+    /**
+     * Name of the GET parameter for the locale.
+     */
+    const GET_NAME = 'locale';
+
+    /**
      * Whether the locale was guessed or not.
      *
@@ -54 +64 @@
      */
     private function set_locale() {
-        if ( ! empty( $_GET['locale'] ) ) {
-            $get_locale = $this->sanitize_locale( $_GET['locale'] );
+        if ( ! empty( $_GET[ self::GET_NAME ] ) ) {
+            $get_locale = $this->sanitize_locale( $_GET[ self::GET_NAME ] );
 
             $this->locale = $this->check_variants( $get_locale ) ?: $this->locale;
-        } elseif ( ! empty( $_COOKIE['wporg_locale'] ) ) {
-            $locale = $this->sanitize_locale( $_COOKIE['wporg_locale'] );
+        } elseif ( ! empty( $_COOKIE[ self::COOKIE_NAME ] ) ) {
+            $locale = $this->sanitize_locale( $_COOKIE[ self::COOKIE_NAME ] );
 
             if ( in_array( $locale, $this->active_locales, true ) ) {
@@ -68 +78 @@
         }
 
-        if ( empty( $_COOKIE['wporg_locale'] ) || $this->locale !== $_COOKIE['wporg_locale'] ) {
-            setcookie( 'wporg_locale', $this->locale, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN, is_ssl() );
+        if ( empty( $_COOKIE[ self::COOKIE_NAME ] ) || $this->locale !== $_COOKIE[ self::COOKIE_NAME ] ) {
+            setcookie( self::COOKIE_NAME, $this->locale, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN, is_ssl() );
         }
     }