<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[43776] branches/5.0/src: REST API: Render response in user locale with `?_locale=user`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/43776">43776</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/43776","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>danielbachhuber</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-10-21 15:02:49 +0000 (Sun, 21 Oct 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>REST API: Render response in user locale with `?_locale=user`.
Introduces new `determine_locale()` function for deciding the proper locale to use for a response. Default value is `get_user_locale()` in the admin, and `get_locale()` on the frontend. Because REST API requests are considered frontend requests, `?_locale=user` can be used to render the response in the user's locale.
Also updates `wp-login.php?wp_lang` implementation to benefit from this abstraction.
Props flixos90, mnelson4, swissspidy, TimothyBlynJacobs.
Fixes <a href="https://core.trac.wordpress.org/ticket/44758">#44758</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches50srcwpincludesclasswplocaleswitcherphp">branches/5.0/src/wp-includes/class-wp-locale-switcher.php</a></li>
<li><a href="#branches50srcwpincludesgeneraltemplatephp">branches/5.0/src/wp-includes/general-template.php</a></li>
<li><a href="#branches50srcwpincludesl10nphp">branches/5.0/src/wp-includes/l10n.php</a></li>
<li><a href="#branches50srcwpincludesscriptloaderphp">branches/5.0/src/wp-includes/script-loader.php</a></li>
<li><a href="#branches50srcwploginphp">branches/5.0/src/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches50srcwpincludesclasswplocaleswitcherphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/src/wp-includes/class-wp-locale-switcher.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/src/wp-includes/class-wp-locale-switcher.php 2018-10-20 08:35:41 UTC (rev 43775)
+++ branches/5.0/src/wp-includes/class-wp-locale-switcher.php 2018-10-21 15:02:49 UTC (rev 43776)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->original_locale = is_admin() ? get_user_locale() : get_locale();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->original_locale = determine_locale();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->available_languages = array_merge( array( 'en_US' ), get_available_languages() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True on success, false on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function switch_to_locale( $locale ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_locale = is_admin() ? get_user_locale() : get_locale();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_locale = determine_locale();
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $current_locale === $locale ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches50srcwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/src/wp-includes/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/src/wp-includes/general-template.php 2018-10-20 08:35:41 UTC (rev 43775)
+++ branches/5.0/src/wp-includes/general-template.php 2018-10-21 15:02:49 UTC (rev 43776)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -703,7 +703,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $output = __( 'html_lang_attribute' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'html_lang_attribute' === $output || preg_match( '/[^a-zA-Z0-9-]/', $output ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output = is_admin() ? get_user_locale() : get_locale();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output = determine_locale();
</ins><span class="cx" style="display: block; padding: 0 10px"> $output = str_replace( '_', '-', $output );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span></span></pre></div>
<a id="branches50srcwpincludesl10nphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/src/wp-includes/l10n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/src/wp-includes/l10n.php 2018-10-20 08:35:41 UTC (rev 43775)
+++ branches/5.0/src/wp-includes/l10n.php 2018-10-21 15:02:49 UTC (rev 43776)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,6 +105,54 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Determine the current locale desired for the request.
+ *
+ * @since 5.0.0
+ *
+ * @global string $pagenow
+ *
+ * @return string The determined locale.
+ */
+function determine_locale() {
+ /**
+ * Filters the locale for the current request prior to the default determination process.
+ *
+ * Using this filter allows to override the default logic, effectively short-circuiting the function.
+ *
+ * @since 5.0.0
+ *
+ * @param string|null The locale to return and short-circuit, or null as default.
+ */
+ $determined_locale = apply_filters( 'pre_determine_locale', null );
+ if ( ! empty( $determined_locale ) && is_string( $determined_locale ) ) {
+ return $determined_locale;
+ }
+
+ $determined_locale = get_locale();
+
+ if ( is_admin() ) {
+ $determined_locale = get_user_locale();
+ }
+
+ if ( isset( $_GET['_locale'] ) && 'user' === $_GET['_locale'] && wp_is_json_request() && is_user_logged_in() ) {
+ $determined_locale = get_user_locale();
+ }
+
+ if ( ! empty( $_GET['wp_lang'] ) && 'wp-login.php' === $GLOBALS['pagenow'] ) {
+ $determined_locale = sanitize_text_field( $_GET['wp_lang'] );
+ }
+
+ /**
+ * Filters the locale for the current request.
+ *
+ * @since 5.0.0
+ *
+ * @param string $locale The locale.
+ */
+ return apply_filters( 'determine_locale', $determined_locale );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Retrieve the translation of $text.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * If there is no translation, or the text domain isn't loaded, the original text is returned.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -663,7 +711,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function load_default_textdomain( $locale = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null === $locale ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $locale = is_admin() ? get_user_locale() : get_locale();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $locale = determine_locale();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Unload previously loaded strings so we can switch translations.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -711,7 +759,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $locale The plugin's current locale.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $domain Text domain. Unique identifier for retrieving translated strings.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $locale = apply_filters( 'plugin_locale', is_admin() ? get_user_locale() : get_locale(), $domain );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $locale = apply_filters( 'plugin_locale', determine_locale(), $domain );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $mofile = $domain . '-' . $locale . '.mo';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -745,7 +793,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function load_muplugin_textdomain( $domain, $mu_plugin_rel_path = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/l10n.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $locale = apply_filters( 'plugin_locale', is_admin() ? get_user_locale() : get_locale(), $domain );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $locale = apply_filters( 'plugin_locale', determine_locale(), $domain );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $mofile = $domain . '-' . $locale . '.mo';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -784,7 +832,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $locale The theme's current locale.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $domain Text domain. Unique identifier for retrieving translated strings.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $locale = apply_filters( 'theme_locale', is_admin() ? get_user_locale() : get_locale(), $domain );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $locale = apply_filters( 'theme_locale', determine_locale(), $domain );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $mofile = $domain . '-' . $locale . '.mo';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -915,7 +963,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $locale = is_admin() ? get_user_locale() : get_locale();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $locale = determine_locale();
</ins><span class="cx" style="display: block; padding: 0 10px"> $mofile = "{$domain}-{$locale}.mo";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $path = WP_LANG_DIR . '/plugins/' . $mofile;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1210,7 +1258,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> selected( '', $parsed_args['selected'], false )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // List installed languages.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // List installed languages.
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $languages as $language ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $structure[] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<option value="%s" lang="%s"%s data-installed="1">%s</option>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1347,7 +1395,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $locale = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'domain' => $domain,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'lang' => is_admin() ? get_user_locale() : get_locale(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'lang' => determine_locale(),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches50srcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/src/wp-includes/script-loader.php 2018-10-20 08:35:41 UTC (rev 43775)
+++ branches/5.0/src/wp-includes/script-loader.php 2018-10-21 15:02:49 UTC (rev 43776)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -905,7 +905,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'mediaelement-migrate', "/wp-includes/js/mediaelement/mediaelement-migrate$suffix.js", array(), false, 1);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->add_inline_script( 'mediaelement-core', sprintf( 'var mejsL10n = %s;', wp_json_encode( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'language' => strtolower( strtok( is_admin() ? get_user_locale() : get_locale(), '_-' ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'language' => strtolower( strtok( determine_locale(), '_-' ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'strings' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'mejs.install-flash' => __( 'You are using a browser that does not have Flash player enabled or installed. Please turn on your Flash player plugin or download the latest version from https://get.adobe.com/flashplayer/' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'mejs.fullscreen-off' => __( 'Turn off Fullscreen' ),
</span></span></pre></div>
<a id="branches50srcwploginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/src/wp-login.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/src/wp-login.php 2018-10-20 08:35:41 UTC (rev 43775)
+++ branches/5.0/src/wp-login.php 2018-10-21 15:02:49 UTC (rev 43776)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -437,9 +437,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( SITECOOKIEPATH != COOKIEPATH )
</span><span class="cx" style="display: block; padding: 0 10px"> setcookie( TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$lang = ! empty( $_GET['wp_lang'] ) ? sanitize_text_field( $_GET['wp_lang'] ) : '';
-$switched_locale = switch_to_locale( $lang );
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires when the login form is initialized.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -500,10 +497,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH, COOKIE_DOMAIN, $secure );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $switched_locale ) {
- restore_previous_locale();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( wp_get_referer() );
</span><span class="cx" style="display: block; padding: 0 10px"> exit();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -521,10 +514,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $requested_redirect_to = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $switched_locale ) {
- restore_previous_locale();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the log out redirect URL.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -618,10 +607,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> login_footer('user_login');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $switched_locale ) {
- restore_previous_locale();
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'resetpass' :
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -747,10 +732,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> login_footer('user_pass');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $switched_locale ) {
- restore_previous_locale();
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'register' :
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -834,10 +815,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> login_footer('user_login');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $switched_locale ) {
- restore_previous_locale();
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'confirmaction' :
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1119,9 +1096,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> login_footer();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $switched_locale ) {
- restore_previous_locale();
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> } // end action switch
</span></span></pre>
</div>
</div>
</body>
</html>