<!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>[17403] branches/3.1/wp-includes/post.php:
Do not use PHP5-only array_combine.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17403">17403</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2011-02-05 18:46:15 +0000 (Sat, 05 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Do not use PHP5-only array_combine. props duck_. see <a href="http://trac.wordpress.org/ticket/16459">#16459</a> for 3.1</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 (17402 => 17403)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/post.php 2011-02-05 18:46:07 UTC (rev 17402)
+++ branches/3.1/wp-includes/post.php 2011-02-05 18:46:15 UTC (rev 17403)
</span><span class="lines">@@ -5073,8 +5073,20 @@
</span><span class="cx"> * @return array The array of post format slugs.
</span><span class="cx"> */
</span><span class="cx"> function get_post_format_slugs() {
</span><del>- $slugs = array_keys( get_post_format_strings() );
- return array_combine( $slugs, $slugs );
</del><ins>+ // 3.2-early: use array_combine() and array_keys( get_post_format_strings() )
+ $slugs = array(
+ 'standard' => 'standard', // Special case. any value that evals to false will be considered standard
+ 'aside' => 'aside',
+ 'chat' => 'chat',
+ 'gallery' => 'gallery',
+ 'link' => 'link',
+ 'image' => 'image',
+ 'quote' => 'quote',
+ 'status' => 'status',
+ 'video' => 'video',
+ 'audio' => 'audio',
+ );
+ return $slugs;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>