<!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>[6770] sites/trunk/wordpress.org/public_html/wp-content/plugins: Translate: Split translation editors list into project and inherited editors.</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 { 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="http://meta.trac.wordpress.org/changeset/6770">6770</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/6770","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-02-26 20:14:23 +0000 (Mon, 26 Feb 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'>Translate: Split translation editors list into project and inherited editors.

Fixes <a href="http://meta.trac.wordpress.org/ticket/3461">#3461</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplateslocaleprojectphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/locale-project.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatesstylecss">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/style.css</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesincroutesclasslocalephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplateslocaleprojectphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/locale-project.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/locale-project.php     2018-02-26 18:58:53 UTC (rev 6769)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/locale-project.php       2018-02-26 20:14:23 UTC (rev 6770)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,14 +258,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">        </div>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <?php if ( $locale_contributors['editors'] ) : ?>
-               <div class="locale-project-contributors-group locale-project-contributors-editors">
-                       <h3>Translation Editors</h3>
-                       <small>These users can validate and approve your translations.</small>
-                       <br><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="locale-project-contributors-group locale-project-contributors-editors">
+               <h3>Translation Editors</h3>
+               <?php
+               if ( $locale_contributors['editors']['project'] ) :
+                       ?>
+                       <p>These users can validate and approve your translations for this specific project.</p>
</ins><span class="cx" style="display: block; padding: 0 10px">                         <ul>
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                foreach ( $locale_contributors['editors'] as $editor ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         foreach ( $locale_contributors['editors']['project'] as $editor ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                         printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                '<li><a href="https://profiles.wordpress.org/%s/">%s %s</a></li>',
</span><span class="cx" style="display: block; padding: 0 10px">                                                $editor->nicename,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,8 +276,33 @@
</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">                        </ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                </div>
-       <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php
+               else :
+                       ?>
+                       <p>There are no editors for this specific project, yet. <a href="https://make.wordpress.org/polyglots/handbook/rosetta/theme-plugin-directories/">Become an editor.</a></p>
+                       <?php
+               endif;
+
+               if ( $locale_contributors['editors']['inherited'] ) :
+                       ?>
+                       <hr>
+                       <p>The following users can edit translations for either a parent project or all projects.</p>
+                       <ul class="compressed">
+                               <?php
+                               foreach ( $locale_contributors['editors']['inherited'] as $editor ) {
+                                       printf(
+                                               '<li><a href="https://profiles.wordpress.org/%s/">%s %s</a></li>',
+                                               $editor->nicename,
+                                               get_avatar( $editor->email, 15 ),
+                                               $editor->display_name ? $editor->display_name : $editor->nicename
+                                       );
+                               }
+                               ?>
+                       </ul>
+                       <?php
+               endif;
+               ?>
+       </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> <script>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatesstylecss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/style.css      2018-02-26 18:58:53 UTC (rev 6769)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/style.css        2018-02-26 20:14:23 UTC (rev 6770)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1640,9 +1640,13 @@
</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">+.locale-project-contributors-group hr {
+       margin: 30px 0;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .locale-project-contributors-group ul {
</span><span class="cx" style="display: block; padding: 0 10px">        padding: 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        margin: 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin: 10px 0;
</ins><span class="cx" style="display: block; padding: 0 10px">         list-style: none;
</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">@@ -1655,6 +1659,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">        margin-right: 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">+.locale-project-contributors-group ul.compressed li {
+       display: inline-block;
+       margin-right: 8px;
+       font-size: small;
+}
+
+.locale-project-contributors-group ul.compressed li:not(:last-child):after {
+       content: ', ';
+}
+
+.locale-project-contributors-group ul.compressed .avatar {
+       margin-right: 3px;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .locale-project-contributors-table {
</span><span class="cx" style="display: block; padding: 0 10px">        width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggproutesincroutesclasslocalephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php      2018-02-26 18:58:53 UTC (rev 6769)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php        2018-02-26 20:14:23 UTC (rev 6770)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,8 +371,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">        private function get_translation_editors( $project, $locale_slug ) {
</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $editors = [
+                       'project'   => [],
+                       'inherited' => [],
+               ];
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 // Get the translation editors of the project.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $editors = (array) $wpdb->get_col( $wpdb->prepare( "
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $editors['project'] = (array) $wpdb->get_col( $wpdb->prepare( "
</ins><span class="cx" style="display: block; padding: 0 10px">                         SELECT
</span><span class="cx" style="display: block; padding: 0 10px">                                `user_id`
</span><span class="cx" style="display: block; padding: 0 10px">                        FROM {$wpdb->wporg_translation_editors}
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,24 +386,35 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                AND `locale` IN (%s, 'all-locales')
</span><span class="cx" style="display: block; padding: 0 10px">                ", $project->id, $locale_slug ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Get the translation editors of parent projects.
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $project->parent_project_id ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $parent_project_id = $project->parent_project_id;
</span><span class="cx" style="display: block; padding: 0 10px">                        $parent_project = GP::$project->get( $parent_project_id );
</span><span class="cx" style="display: block; padding: 0 10px">                        while ( $parent_project_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $editors = $editors + (array) $wpdb->get_col( $wpdb->prepare( "
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $editors['inherited'] = array_merge( $editors['inherited'], (array) $wpdb->get_col( $wpdb->prepare( "
</ins><span class="cx" style="display: block; padding: 0 10px">                                         SELECT
</span><span class="cx" style="display: block; padding: 0 10px">                                                `user_id`
</span><span class="cx" style="display: block; padding: 0 10px">                                        FROM {$wpdb->wporg_translation_editors}
</span><span class="cx" style="display: block; padding: 0 10px">                                        WHERE
</span><span class="cx" style="display: block; padding: 0 10px">                                                `project_id` = %d
</span><span class="cx" style="display: block; padding: 0 10px">                                                AND `locale` IN (%s, 'all-locales')
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                ", $parent_project->id, $locale_slug ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         ", $parent_project->id, $locale_slug ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                $parent_project = GP::$project->get( $parent_project_id );
</span><span class="cx" style="display: block; padding: 0 10px">                                $parent_project_id = $parent_project->parent_project_id;
</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">+                // Get the translation editors for all projects.
+               $editors['inherited'] = array_merge( $editors['inherited'], (array) $wpdb->get_col( $wpdb->prepare( "
+                       SELECT
+                               `user_id`
+                       FROM {$wpdb->wporg_translation_editors}
+                       WHERE
+                               `project_id` = '0'
+                               AND `locale` = %s
+               ", $locale_slug ) ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 return $editors;
</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">@@ -413,27 +429,41 @@
</span><span class="cx" style="display: block; padding: 0 10px">        private function get_locale_contributors( $project, $locale_slug, $set_slug ) {
</span><span class="cx" style="display: block; padding: 0 10px">                global $wpdb;
</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_contributors = array(
-                       'editors'      => array(),
-                       'contributors' => array(),
-               );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $locale_contributors = [
+                       'editors'      => [
+                               'project'   => [],
+                               'inherited' => [],
+                       ],
+                       'contributors' => [],
+               ];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Get the translation editors of the project.
</span><span class="cx" style="display: block; padding: 0 10px">                $editors = $this->get_translation_editors( $project, $locale_slug );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $editor_ids = [];
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 // Get the names of the translation editors.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                foreach ( $editors as $editor_id ) {
-                       $user = get_user_by( 'id', $editor_id );
-                       if ( ! $user ) {
-                               continue;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         foreach ( [ 'project', 'inherited'] as $editor_source ) {
+                       foreach ( $editors[ $editor_source ] as $editor_id ) {
+                               $user = get_user_by( 'id', $editor_id );
+                               if ( ! $user ) {
+                                       continue;
+                               }
+
+                               $locale_contributors['editors'][ $editor_source ][ $editor_id ] = (object) array(
+                                       'nicename'     => $user->user_nicename,
+                                       'display_name' => $this->_encode( $user->display_name ),
+                                       'email'        => $user->user_email,
+                               );
+
+                               $editor_ids[] = $editor_id;
</ins><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_contributors['editors'][ $editor_id ] = (object) array(
-                               'nicename'     => $user->user_nicename,
-                               'display_name' => $this->_encode( $user->display_name ),
-                               'email'        => $user->user_email,
-                       );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 uasort( $locale_contributors['editors'][ $editor_source ], function( $a, $b ) {
+                               return strcasecmp( $a->display_name, $b->display_name );
+                       } );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">                 unset( $editors );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Get the contributors of the project.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -469,8 +499,6 @@
</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">-                $editors = array_keys( $locale_contributors['editors'] );
-
</del><span class="cx" style="display: block; padding: 0 10px">                 // Get the names of the contributors.
</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $contributors as $contributor ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( isset( $locale_contributors['contributors'][ $contributor->user_id ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -501,19 +529,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                'current_count' => $contributor->current_count,
</span><span class="cx" style="display: block; padding: 0 10px">                                'waiting_count' => $contributor->waiting_count,
</span><span class="cx" style="display: block; padding: 0 10px">                                'fuzzy_count'   => $contributor->fuzzy_count,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'is_editor'     => in_array( $user->ID, $editors ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'is_editor'     => in_array( $user->ID, $editor_ids ),
</ins><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">-                unset( $contributors, $editors );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         unset( $contributors, $editor_ids );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                uasort( $locale_contributors['contributors'], function( $a, $b ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        return $a->total_count < $b->total_count;
</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">-                uasort( $locale_contributors['editors'], function( $a, $b ) {
-                       return strcasecmp( $a->display_name, $b->display_name );
-               } );
-
</del><span class="cx" style="display: block; padding: 0 10px">                 return $locale_contributors;
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre>
</div>
</div>

</body>
</html>