<!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>[BuddyPress] [3392] branches/1.2/bp-core.php: Fixes #2243.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3392</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-11-11 06:34:54 +0000 (Thu, 11 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2243. Back ported from trunk. Props francescolaffi, boonebgorges.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorephp">branches/1.2/bp-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core.php (3391 => 3392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core.php 2010-11-11 06:24:37 UTC (rev 3391)
+++ branches/1.2/bp-core.php 2010-11-11 06:34:54 UTC (rev 3392)
</span><span class="lines">@@ -1963,11 +1963,17 @@
</span><span class="cx"> * @package BuddyPress Core
</span><span class="cx"> */
</span><span class="cx"> function bp_core_load_buddypress_textdomain() {
</span><del>- $locale = apply_filters( 'buddypress_locale', get_locale() );
- $mofile = BP_PLUGIN_DIR . "/bp-languages/buddypress-$locale.mo";
</del><ins>+ $locale = apply_filters( 'buddypress_locale', get_locale() );
+ $mofile = sprintf( 'buddypress-%s.mo', $locale );
+ $mofile_global = WP_LANG_DIR . '/' . $mofile;
+ $mofile_local = BP_PLUGIN_DIR . '/bp-languages/' . $mofile;
</ins><span class="cx">
</span><del>- if ( file_exists( $mofile ) )
- load_textdomain( 'buddypress', $mofile );
</del><ins>+ if ( file_exists( $mofile_global ) )
+ return load_textdomain( 'buddypress', $mofile_global );
+ elseif ( file_exists( $mofile_local ) )
+ return load_textdomain( 'buddypress', $mofile_local );
+ else
+ return false;
</ins><span class="cx"> }
</span><span class="cx"> add_action ( 'bp_loaded', 'bp_core_load_buddypress_textdomain', 2 );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>