<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[12900] trunk/wp-includes: Integrate mu_locale() into get_locale().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12900">12900</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-29 19:03:51 +0000 (Fri, 29 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Integrate mu_locale() into get_locale(). see <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesl10nphp">trunk/wp-includes/l10n.php</a></li>
<li><a href="#trunkwpincludesmsdefaultfiltersphp">trunk/wp-includes/ms-default-filters.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/l10n.php (12899 => 12900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/l10n.php 2010-01-29 18:53:32 UTC (rev 12899)
+++ trunk/wp-includes/l10n.php 2010-01-29 19:03:51 UTC (rev 12900)
</span><span class="lines">@@ -35,6 +35,16 @@
</span><span class="cx"> if ( defined( 'WPLANG' ) )
</span><span class="cx"> $locale = WPLANG;
</span><span class="cx">
</span><ins>+ // If multisite, check options.
+ if ( is_multisite() && !defined('WP_INSTALLING') ) {
+ $ms_locale = get_option('WPLANG');
+ if ( $ms_locale === false )
+ $ms_locale = get_site_option('WPLANG');
+
+ if ( $ms_locale !== false )
+ $locale = $ms_locale;
+ }
+
</ins><span class="cx"> if ( empty( $locale ) )
</span><span class="cx"> $locale = 'en_US';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmsdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-default-filters.php (12899 => 12900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-default-filters.php 2010-01-29 18:53:32 UTC (rev 12899)
+++ trunk/wp-includes/ms-default-filters.php 2010-01-29 19:03:51 UTC (rev 12900)
</span><span class="lines">@@ -14,9 +14,6 @@
</span><span class="cx"> // Register Nonce
</span><span class="cx"> add_action ( 'signup_hidden_fields', 'signup_nonce_fields' );
</span><span class="cx">
</span><del>-// Locale
-add_filter ( 'locale', 'mu_locale' );
-
</del><span class="cx"> // Template
</span><span class="cx"> add_action ( 'template_redirect', 'maybe_redirect_404' );
</span><span class="cx"> add_filter ( 'allowed_redirect_hosts', 'redirect_this_site' );
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (12899 => 12900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-01-29 18:53:32 UTC (rev 12899)
+++ trunk/wp-includes/ms-functions.php 2010-01-29 19:03:51 UTC (rev 12900)
</span><span class="lines">@@ -1752,18 +1752,6 @@
</span><span class="cx"> return $email;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function mu_locale( $locale ) {
- if ( defined('WP_INSTALLING') == false ) {
- $mu_locale = get_option('WPLANG');
- if ( $mu_locale === false )
- $mu_locale = get_site_option('WPLANG');
-
- if ( $mu_locale !== false )
- return $mu_locale;
- }
- return $locale;
-}
-
</del><span class="cx"> function signup_nonce_fields() {
</span><span class="cx"> $id = mt_rand();
</span><span class="cx"> echo "<input type='hidden' name='signup_form_id' value='{$id}' />";
</span></span></pre>
</div>
</div>
</body>
</html>