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

Timestamp:

02/15/2018 11:01:34 AM (9 years ago)

Author:

obenland

Message:

Locale Detection: Let GET param override Cookie

Allows for switching locales based on context.

See #1673.

File:

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

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

@@ -44 +44 @@
                 $this->active_locales = $this->get_active_locales();
 
-                if ( ! empty( $_COOKIE[ 'wporg_locale' ] ) ) {
+                if ( ! empty( $_GET['locale'] ) ) {
+                        $get_locale = $this->sanitize_locale( $_GET['locale'] );
+
+                        $this->locale = $this->check_variants( $get_locale ) ?: $this->locale;
+                } elseif ( ! empty( $_COOKIE['wporg_locale'] ) ) {
                         $locale = $this->sanitize_locale( $_COOKIE['wporg_locale'] );
 
                         if ( in_array( $locale, $this->active_locales, true ) ) {
                                 $this->locale = $locale;
-                                return;
                         }
-                }
-
-                if ( isset( $_GET['locale'] ) ) {
-                        $get_locale = $this->sanitize_locale( $_GET['locale'] );
-
-                        $this->locale = $this->check_variants( $get_locale ) ?: $this->locale;
                 } else {
                         $this->locale = $this->guess_locale() ?: $this->locale;
+                        setcookie( 'wporg_locale', $this->locale, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN, is_ssl() );
                 }
-
-                setcookie( 'wporg_locale', $this->locale, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN, is_ssl() );
         }