<!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>[27373] trunk: Eliminate some of our last remaining `create_function()` instances</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27373">27373</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2014-03-03 16:20:12 +0000 (Mon, 03 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate some of our last remaining `create_function()` instances
* Moved some into private function callbacks
* Eliminated some that weren't necessary anymore
props obenland, markjaquith, nacin. fixes <a href="http://core.trac.wordpress.org/ticket/14424">#14424</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminimportphp">trunk/src/wp-admin/import.php</a></li>
<li><a href="#trunksrcwpadminincludesimportphp">trunk/src/wp-admin/includes/import.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunksrcwpincludescategorytemplatephp">trunk/src/wp-includes/category-template.php</a></li>
<li><a href="#trunktestsphpunittestsimportimportphp">trunk/tests/phpunit/tests/import/import.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminimportphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/import.php (27372 => 27373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/import.php 2014-03-03 15:53:52 UTC (rev 27372)
+++ trunk/src/wp-admin/import.php 2014-03-03 16:20:12 UTC (rev 27373)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> if ( empty( $importers ) ) {
</span><span class="cx"> echo '<p>' . __('No importers are available.') . '</p>'; // TODO: make more helpful
</span><span class="cx"> } else {
</span><del>- uasort($importers, create_function('$a, $b', 'return strnatcasecmp($a[0], $b[0]);'));
</del><ins>+ uasort( $importers, '_uasort_by_first_member' );
</ins><span class="cx"> ?>
</span><span class="cx"> <table class="widefat importers">
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminincludesimportphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/import.php (27372 => 27373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/import.php 2014-03-03 15:53:52 UTC (rev 27372)
+++ trunk/src/wp-admin/includes/import.php 2014-03-03 16:20:12 UTC (rev 27373)
</span><span class="lines">@@ -15,12 +15,29 @@
</span><span class="cx"> */
</span><span class="cx"> function get_importers() {
</span><span class="cx"> global $wp_importers;
</span><del>- if ( is_array($wp_importers) )
- uasort($wp_importers, create_function('$a, $b', 'return strcmp($a[0], $b[0]);'));
</del><ins>+ if ( is_array( $wp_importers ) ) {
+ uasort( $wp_importers, '_uasort_by_first_member' );
+ }
</ins><span class="cx"> return $wp_importers;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Sorts a multidimensional array by first member of each top level member
+ *
+ * Used by uasort() as a callback, should not be used directly.
+ *
+ * @since 2.9.0
+ * @access private
+ *
+ * @param array $a
+ * @param array $b
+ * @return int
+ */
+function _uasort_by_first_member( $a, $b ) {
+ return strnatcasecmp( $a[0], $b[0] );
+}
+
+/**
</ins><span class="cx"> * Register importer for WordPress.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/media.php (27372 => 27373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/media.php 2014-03-03 15:53:52 UTC (rev 27372)
+++ trunk/src/wp-admin/includes/media.php 2014-03-03 16:20:12 UTC (rev 27373)
</span><span class="lines">@@ -2255,15 +2255,18 @@
</span><span class="cx"> if ( get_user_setting('uploader') )
</span><span class="cx"> $form_class .= ' html-uploader';
</span><span class="cx">
</span><del>- $_GET['paged'] = isset( $_GET['paged'] ) ? intval($_GET['paged']) : 0;
- if ( $_GET['paged'] < 1 )
- $_GET['paged'] = 1;
- $start = ( $_GET['paged'] - 1 ) * 10;
- if ( $start < 1 )
- $start = 0;
- add_filter( 'post_limits', create_function( '$a', "return 'LIMIT $start, 10';" ) );
</del><ins>+ $q = $_GET;
+ $q['posts_per_page'] = 10;
+ $q = isset( $q['paged'] ) ? intval( $q['paged'] ) : 0;
+ if ( $q['paged'] < 1 ) {
+ $q['paged'] = 1;
+ }
+ $q['offset'] = ( $q['paged'] - 1 ) * 10;
+ if ( $q['offset'] < 1 ) {
+ $q['offset'] = 0;
+ }
</ins><span class="cx">
</span><del>- list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
</del><ins>+ list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query( $q );
</ins><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/post.php (27372 => 27373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/post.php 2014-03-03 15:53:52 UTC (rev 27372)
+++ trunk/src/wp-admin/includes/post.php 2014-03-03 16:20:12 UTC (rev 27373)
</span><span class="lines">@@ -934,21 +934,13 @@
</span><span class="cx"> unset($q['post_mime_type']);
</span><span class="cx">
</span><span class="cx"> if ( isset($q['detached']) )
</span><del>- add_filter('posts_where', '_edit_attachments_query_helper');
</del><ins>+ $q['post_parent'] = 0;
</ins><span class="cx">
</span><span class="cx"> wp( $q );
</span><span class="cx">
</span><del>- if ( isset($q['detached']) )
- remove_filter('posts_where', '_edit_attachments_query_helper');
-
</del><span class="cx"> return array($post_mime_types, $avail_post_mime_types);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function _edit_attachments_query_helper($where) {
- global $wpdb;
- return $where .= " AND {$wpdb->posts}.post_parent < 1";
-}
-
</del><span class="cx"> /**
</span><span class="cx"> * Returns the list of classes to be used by a metabox
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunksrcwpincludescategorytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/category-template.php (27372 => 27373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/category-template.php 2014-03-03 15:53:52 UTC (rev 27372)
+++ trunk/src/wp-includes/category-template.php 2014-03-03 16:20:12 UTC (rev 27373)
</span><span class="lines">@@ -622,10 +622,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( !isset( $args['topic_count_text_callback'] ) && isset( $args['single_text'] ) && isset( $args['multiple_text'] ) ) {
</span><del>- $body = 'return sprintf (
- _n(' . var_export($args['single_text'], true) . ', ' . var_export($args['multiple_text'], true) . ', $count),
- number_format_i18n( $count ));';
- $args['topic_count_text_callback'] = create_function('$count', $body);
</del><ins>+ $args['topic_count_text_callback'] = '_plugin_topic_count';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $args = wp_parse_args( $args, $defaults );
</span><span class="lines">@@ -725,6 +722,21 @@
</span><span class="cx"> return ( $a->count > $b->count );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Default text for tooltip for tag links
+ *
+ * @since 3.9.0
+ * @access private
+ *
+ * @param integer $count Number of posts with that tag.
+ * @param object $tag Tag object.
+ * @param array $args Arguments for the tag cloud.
+ * @return string Text for the tooltip of a tag link.
+ */
+function _plugin_topic_count( $count, $tag, $args ) {
+ return sprintf( 1 == $count? $args['single_text'] : $args['multiple_text'], number_format_i18n( $count ) );
+}
+
</ins><span class="cx"> //
</span><span class="cx"> // Helper functions
</span><span class="cx"> //
</span></span></pre></div>
<a id="trunktestsphpunittestsimportimportphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/import/import.php (27372 => 27373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/import/import.php 2014-03-03 15:53:52 UTC (rev 27372)
+++ trunk/tests/phpunit/tests/import/import.php 2014-03-03 16:20:12 UTC (rev 27373)
</span><span class="lines">@@ -227,5 +227,25 @@
</span><span class="cx"> $this->assertEquals( 1, $comment_count->total_comments );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function test_ordering_of_importers() {
+ global $wp_importers;
+ $_wp_importers = $wp_importers; // Preserve global state
+ $wp_importers = array(
+ 'xyz1' => array( 'xyz1' ),
+ 'XYZ2' => array( 'XYZ2' ),
+ 'abc2' => array( 'abc2' ),
+ 'ABC1' => array( 'ABC1' ),
+ 'def1' => array( 'def1' ),
+ );
+ $this->assertEquals( array(
+ 'ABC1' => array( 'ABC1' ),
+ 'abc2' => array( 'abc2' ),
+ 'def1' => array( 'def1' ),
+ 'xyz1' => array( 'xyz1' ),
+ 'XYZ2' => array( 'XYZ2' ),
+ ), get_importers() );
+ $wp_importers = $_wp_importers; // Restore global state
+ }
+
</ins><span class="cx"> // function test_menu_import
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>