<!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>[17394] branches/3.1/wp-includes/post.php:
No translation for post format slugs.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17394">17394</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2011-02-05 18:25:03 +0000 (Sat, 05 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>No translation for post format slugs. Too fragile for the future. fixes <a href="http://trac.wordpress.org/ticket/16459">#16459</a> for 3.1 branch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches31wpincludespostphp">branches/3.1/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches31wpincludespostphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/post.php (17393 => 17394)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/post.php 2011-02-05 18:24:55 UTC (rev 17393)
+++ branches/3.1/wp-includes/post.php 2011-02-05 18:25:03 UTC (rev 17394)
</span><span class="lines">@@ -5066,28 +5066,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Retrieves an array of (translated and sanitized) post format slugs.
</del><ins>+ * Retrieves an array of post format slugs.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span><del>- * @uses sanitize_title_with_dashes()
- * @return array The array of (translated and sanitized) post format slugs.
</del><ins>+ * @return array The array of post format slugs.
</ins><span class="cx"> */
</span><span class="cx"> function get_post_format_slugs() {
</span><del>- $slugs = array(
- 'standard' => _x( 'standard', 'Post format slug' ),
- 'aside' => _x( 'aside', 'Post format slug' ),
- 'chat' => _x( 'chat', 'Post format slug' ),
- 'gallery' => _x( 'gallery', 'Post format slug' ),
- 'link' => _x( 'link', 'Post format slug' ),
- 'image' => _x( 'image', 'Post format slug' ),
- 'quote' => _x( 'quote', 'Post format slug' ),
- 'status' => _x( 'status', 'Post format slug' ),
- 'video' => _x( 'video', 'Post format slug' ),
- 'audio' => _x( 'audio', 'Post format slug' ),
- );
- $slugs = array_map( 'sanitize_title_with_dashes', $slugs );
- return $slugs;
</del><ins>+ $slugs = array_keys( get_post_format_strings() );
+ return array_combine( $slugs, $slugs );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -5152,7 +5139,7 @@
</span><span class="cx"> function _post_format_request( $qvs ) {
</span><span class="cx"> if ( ! isset( $qvs['post_format'] ) )
</span><span class="cx"> return $qvs;
</span><del>- $slugs = array_flip( get_post_format_slugs() );
</del><ins>+ $slugs = get_post_format_slugs();
</ins><span class="cx"> if ( isset( $slugs[ $qvs['post_format'] ] ) )
</span><span class="cx"> $qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
</span><span class="cx"> $tax = get_taxonomy( 'post_format' );
</span><span class="lines">@@ -5171,9 +5158,8 @@
</span><span class="cx"> global $wp_rewrite;
</span><span class="cx"> if ( 'post_format' != $taxonomy )
</span><span class="cx"> return $link;
</span><del>- $slugs = get_post_format_slugs();
</del><span class="cx"> if ( $wp_rewrite->get_extra_permastruct( $taxonomy ) ) {
</span><del>- return str_replace( "/{$term->slug}", '/' . $slugs[ str_replace( 'post-format-', '', $term->slug ) ], $link );
</del><ins>+ return str_replace( "/{$term->slug}", '/' . str_replace( 'post-format-', '', $term->slug ), $link );
</ins><span class="cx"> } else {
</span><span class="cx"> $link = remove_query_arg( 'post_format', $link );
</span><span class="cx"> return add_query_arg( 'post_format', str_replace( 'post-format-', '', $term->slug ), $link );
</span></span></pre>
</div>
</div>
</body>
</html>