<!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>[18690] trunk/wp-includes: Remove the unimplemented user locale code in the admin bar until we actually implement it for real.</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 { 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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18690">18690</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2011-09-16 11:12:37 +0000 (Fri, 16 Sep 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove the unimplemented user locale code in the admin bar until we actually implement it for real.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkwpincludesclasswpadminbarphp">trunk/wp-includes/class-wp-admin-bar.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (18689 => 18690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php        2011-09-16 10:57:31 UTC (rev 18689)
+++ trunk/wp-includes/admin-bar.php        2011-09-16 11:12:37 UTC (rev 18690)
</span><span class="lines">@@ -55,8 +55,6 @@
</span><span class="cx">         if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) )
</span><span class="cx">                 return false;
</span><span class="cx"> 
</span><del>-        $wp_admin_bar-&gt;load_user_locale_translations();
-
</del><span class="cx">         do_action_ref_array( 'admin_bar_menu', array( &amp;$wp_admin_bar ) );
</span><span class="cx"> 
</span><span class="cx">         do_action( 'wp_before_admin_bar_render' );
</span><span class="lines">@@ -64,8 +62,6 @@
</span><span class="cx">         $wp_admin_bar-&gt;render();
</span><span class="cx"> 
</span><span class="cx">         do_action( 'wp_after_admin_bar_render' );
</span><del>-
-        $wp_admin_bar-&gt;unload_user_locale_translations();
</del><span class="cx"> }
</span><span class="cx"> add_action( 'wp_footer', 'wp_admin_bar_render', 1000 );
</span><span class="cx"> add_action( 'admin_footer', 'wp_admin_bar_render', 1000 );
</span></span></pre></div>
<a id="trunkwpincludesclasswpadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-admin-bar.php (18689 => 18690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-admin-bar.php        2011-09-16 10:57:31 UTC (rev 18689)
+++ trunk/wp-includes/class-wp-admin-bar.php        2011-09-16 11:12:37 UTC (rev 18690)
</span><span class="lines">@@ -1,8 +1,6 @@
</span><span class="cx"> &lt;?php
</span><span class="cx"> class WP_Admin_Bar {
</span><del>-        var $changed_locale = false;
</del><span class="cx">         var $menu;
</span><del>-        var $need_to_change_locale = false;
</del><span class="cx">         var $proto = 'http://';
</span><span class="cx">         var $user;
</span><span class="cx"> 
</span><span class="lines">@@ -26,7 +24,6 @@
</span><span class="cx">                                 $this-&gt;user-&gt;domain = trailingslashit( home_url() );
</span><span class="cx">                                 $this-&gt;user-&gt;account_domain = $this-&gt;user-&gt;domain;
</span><span class="cx">                         }
</span><del>-                        $this-&gt;user-&gt;locale = get_locale();
</del><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 add_action( 'wp_head', 'wp_admin_bar_header' );
</span><span class="lines">@@ -208,30 +205,5 @@
</span><span class="cx"> 
</span><span class="cx">                 return false;
</span><span class="cx">         }
</span><del>-
-        // TODO: Convert to a core feature for multisite or remove
-        function load_user_locale_translations() {
-                $this-&gt;need_to_change_locale = ( get_locale() != $this-&gt;user-&gt;locale );
-                if ( ! $this-&gt;need_to_change_locale )
-                        return;
-                /*
-                $this-&gt;previous_translations = get_translations_for_domain( 'default' );
-                $this-&gt;adminbar_locale_filter = lambda( '$_', '$GLOBALS[&quot;wp_admin_bar&quot;]-&gt;user-&gt;locale;' );
-                unload_textdomain( 'default' );
-                add_filter( 'locale', $this-&gt;adminbar_locale_filter );
-                load_default_textdomain();
-                $this-&gt;changed_locale = true;
-                */
-        }
-
-        function unload_user_locale_translations() {
-                global $l10n;
-                if ( ! $this-&gt;changed_locale )
-                        return;
-                /*
-                remove_filter( 'locale', $this-&gt;adminbar_locale_filter );
-                $l10n['default'] = &amp;$this-&gt;previous_translations;
-                */
-        }
</del><span class="cx"> }
</span><del>-?&gt;
</del><ins>+?&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>

</body>
</html>