<!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>[12840] trunk/wp-includes: Move load_muplugin_textdomain() to l10n.php</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12840">12840</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-26 17:25:31 +0000 (Tue, 26 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move load_muplugin_textdomain() to l10n.php</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesl10nphp">trunk/wp-includes/l10n.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 (12839 => 12840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/l10n.php 2010-01-26 17:16:49 UTC (rev 12839)
+++ trunk/wp-includes/l10n.php 2010-01-26 17:25:31 UTC (rev 12840)
</span><span class="lines">@@ -383,6 +383,28 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Load the translated strings for a plugin residing in the mu-plugins dir.
+ *
+ * @since 3.0
+ *
+ * @param string $domain Unique identifier for retrieving translated strings
+ */
+function load_muplugin_textdomain($domain, $path = false) {
+ $locale = get_locale();
+ if ( empty($locale) )
+ $locale = 'en_US';
+
+ /* @todo $path is not used. Was it ever used and was it expected to be an arbitrary absolute dir?
+ * Ideally, it should be relative to WPMU_PLUGIN_DUR.
+ if ( false === $path )
+ $path = WPMU_PLUGIN_DIR;
+ */
+
+ $mofile = WPMU_PLUGIN_DIR . "/$domain-$locale.mo";
+ load_textdomain($domain, $mofile);
+}
+
+/**
</ins><span class="cx"> * Loads the theme's translated strings.
</span><span class="cx"> *
</span><span class="cx"> * If the current locale exists as a .mo file in the theme's root directory, it
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (12839 => 12840)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-01-26 17:16:49 UTC (rev 12839)
+++ trunk/wp-includes/ms-functions.php 2010-01-26 17:25:31 UTC (rev 12840)
</span><span class="lines">@@ -5,18 +5,6 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> */
</span><span class="cx">
</span><del>-function load_muplugin_textdomain($domain, $path = false) {
- $locale = get_locale();
- if ( empty($locale) )
- $locale = 'en_US';
-
- if ( false === $path )
- $path = WPMU_PLUGIN_DIR;
-
- $mofile = WPMU_PLUGIN_DIR . "/$domain-$locale.mo";
- load_textdomain($domain, $mofile);
-}
-
</del><span class="cx"> // @todo use update_blog_details
</span><span class="cx"> function wpmu_update_blogs_date() {
</span><span class="cx"> global $wpdb;
</span></span></pre>
</div>
</div>
</body>
</html>