<!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>[18001] trunk/wp-admin/credits.php: Update the Credits page for changes in the API.</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://trac.wordpress.org/changeset/18001">18001</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-05-23 00:08:51 +0000 (Mon, 23 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update the Credits page for changes in the API. see <a href="http://trac.wordpress.org/ticket/17532">#17532</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincreditsphp">trunk/wp-admin/credits.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincreditsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/credits.php (18000 => 18001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/credits.php        2011-05-22 23:59:55 UTC (rev 18000)
+++ trunk/wp-admin/credits.php        2011-05-23 00:08:51 UTC (rev 18001)
</span><span class="lines">@@ -27,9 +27,9 @@
</span><span class="cx">         global $wp_version;
</span><span class="cx">         $locale = get_locale();
</span><span class="cx">
</span><del>-        $results = get_site_transient( 'wordpress_credits' );
</del><ins>+        $results = get_site_transient( 'wordpress_credits_' . $locale );
</ins><span class="cx">
</span><del>-        if ( !is_array( $results ) || !isset( $results['people'] ) ) {
</del><ins>+        if ( ! is_array( $results ) || ! isset( $results['people'] ) || ! isset( $results['lists'] ) ) {
</ins><span class="cx">                 $response = wp_remote_get( "http://api.wordpress.org/core/credits/1.0/?version=$wp_version&locale=$locale" );
</span><span class="cx">
</span><span class="cx">                 if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
</span><span class="lines">@@ -37,10 +37,10 @@
</span><span class="cx">
</span><span class="cx">                 $results = unserialize( wp_remote_retrieve_body( $response ) );
</span><span class="cx">
</span><del>-                if ( !is_array( $results ) )
</del><ins>+                if ( ! is_array( $results ) )
</ins><span class="cx">                         return false;
</span><span class="cx">
</span><del>-                set_site_transient( 'wordpress_credits', $results, 604800 ); // One week.
</del><ins>+                set_site_transient( 'wordpress_credits_' . $locale, $results, 86400 ); // @todo Set to one week.
</ins><span class="cx">         }
</span><span class="cx">
</span><span class="cx">         return $results;
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> $results = wp_credits();
</span><span class="cx">
</span><del>-if ( !isset( $results['people'] ) ) {
</del><ins>+if ( ! $results ) {
</ins><span class="cx">         echo '<p>' . sprintf( __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
</span><span class="cx">                 'http://wordpress.org/about/',
</span><span class="cx">                 _x( 'http://codex.wordpress.org/Contributing_to_WordPress', 'Url to the codex documentation on contributing to WordPress used on the credits page' ) ) . '</p>';
</span><span class="lines">@@ -85,11 +85,14 @@
</span><span class="cx">         echo "</ul>\n";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if ( isset( $results['props'] ) ) {
-        echo '<h3 class="wp-props-group">' . sprintf( translate( $results['groups']['props'] ), $results['data']['version'] ) . "</h3>\n\n";
-        array_walk( $results['props'], '_wp_credits_add_profile_link', $results['data']['profile_prefix'] );
-        shuffle( $results['props'] );
-        echo wp_sprintf( '%l.', $results['props'] );
</del><ins>+foreach ( (array) $results['lists'] as $group_slug => $members ) {
+        $title = translate( $results['groups'][ $group_slug ] );
+        if ( isset( $results['data']['placeholders'][ $group_slug ] ) )
+                $title = vsprintf( $title, $results['data']['placeholders'][ $group_slug ] );
+        echo '<h3 class="wp-props-group">' . $title . "</h3>\n\n";
+        array_walk( $members, '_wp_credits_add_profile_link', $results['data']['profile_prefix'] );
+        shuffle( $members );
+        echo wp_sprintf( '%l.', $members );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="lines">@@ -107,6 +110,7 @@
</span><span class="cx"> __( 'Extended Core Team' );
</span><span class="cx"> __( 'Recent Rockstars' );
</span><span class="cx"> __( 'Core Contributors to WordPress %s' );
</span><ins>+__( 'Translators for %s' );
</ins><span class="cx"> __( 'Cofounder, Project Lead' );
</span><span class="cx"> __( 'Lead Developer' );
</span><span class="cx"> __( 'UI/UX and Community Lead' );
</span><span class="lines">@@ -115,5 +119,6 @@
</span><span class="cx"> __( 'Designer' );
</span><span class="cx"> __( 'XML-RPC Developer' );
</span><span class="cx"> __( 'Internationalization' );
</span><ins>+__( 'Twenty Eleven' );
</ins><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>