Changeset 16313

Timestamp:

11/11/2010 10:50:36 PM (14 years ago)

Author:

nacin

Message:

Remove more create_function calls. props huichen, see #14424.

Location:

trunk

Files:

• wp-admin/includes/plugin.php (modified) (3 diffs)
• wp-admin/includes/widgets.php (modified) (2 diffs)
• wp-includes/category-template.php (modified) (2 diffs)
• wp-includes/formatting.php (modified) (4 diffs)
• wp-includes/kses.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (2 diffs)
• wp-includes/post.php (modified) (1 diff)

trunk/wp-admin/includes/plugin.php

@@ -261 +261 @@
     }
 
-    uasort( $wp_plugins, create_function( '$a, $b', 'return strnatcasecmp( $a["Name"], $b["Name"] );' ));
+    uasort( $wp_plugins, '_sort_uname_callback' );
 
     $cache_plugins[ $plugin_folder ] = $wp_plugins;
@@ -313 +313 @@
         unset( $wp_plugins['index.php'] );
 
-    uasort( $wp_plugins, create_function( '$a, $b', 'return strnatcasecmp( $a["Name"], $b["Name"] );' ));
+    uasort( $wp_plugins, '_sort_uname_callback' );
 
     return $wp_plugins;
+}
+
+/**
+ * Callback to sort array by a 'Name' key.
+ *
+ * @since 3.1.0
+ * @access private
+ */
+function _sort_uname_callback( $a, $b ) {
+    return strnatcasecmp( $a['Name'], $b['Name'] );
 }
 
@@ -354 +364 @@
     }
 
-    uksort( $dropins, create_function( '$a, $b', 'return strnatcasecmp( $a, $b );' ));
+    uksort( $dropins, 'strnatcasecmp' );
 
     return $dropins;

trunk/wp-admin/includes/widgets.php

@@ -16 +16 @@
 
     $sort = $wp_registered_widgets;
-    usort( $sort, create_function( '$a, $b', 'return strnatcasecmp( $a["name"], $b["name"] );' ) );
+    usort( $sort, '_sort_name_callback' );
     $done = array();
 
@@ -48 +48 @@
 
 /**
+ * Callback to sort array by a 'name' key.
+ *
+ * @since 3.1.0
+ * @access private
+ */
+function _sort_name_callback( $a, $b ) {
+    return strnatcasecmp( $a['name'], $b['name'] );
+}
+
+/**
  * Show the widgets and their settings for a sidebar.
  * Used in the the admin widget config screen.

trunk/wp-includes/category-template.php

@@ -678 +678 @@
         $tag_id = isset($tags[ $key ]->id) ? $tags[ $key ]->id : $key;
         $tag_name = $tags[ $key ]->name;
-        $a[] = "<a href='$tag_link' class='tag-link-$tag_id' title='" . esc_attr( $topic_count_text_callback( $real_count ) ) . "' style='font-size: " .
+        $a[] = "<a href='$tag_link' class='tag-link-$tag_id' title='" . esc_attr( call_user_func( 'topic_count_text_callback', $real_count ) ) . "' style='font-size: " .
             ( $smallest + ( ( $count - $min_count ) * $font_step ) )
             . "$unit;'>$tag_name</a>";
@@ -701 +701 @@
     else
         return $return;
+}
+
+/**
+ * Callback for comparing tags based on name
+ *
+ * @since 3.1.0
+ * @access private
+ */
+function _wp_tag_cloud_name_sort_cb( $a, $b ) {
+    return strnatcasecmp( $a->name, $b->name );
+}
+
+/**
+ * Callback for comparing tags based on count
+ *
+ * @since 3.1.0
+ * @access private
+ */
+function _wp_tag_cloud_count_sort_cb( $a, $b ) {
+    return ( $a->count > $b->count );
 }
 

trunk/wp-includes/formatting.php

@@ -237 +237 @@
     $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
     if ($br) {
-        $pee = preg_replace_callback('/<(script|style).*?<\/\\1>/s', '__autop_newline_preservation_helper', $pee);
+        $pee = preg_replace_callback('/<(script|style).*?<\/\\1>/s', '_autop_newline_preservation_helper', $pee);
         $pee = preg_replace('|(?<!<br />)\s*\n|', "<br />\n", $pee); // optionally make line breaks
         $pee = str_replace('<WPPreserveNewline />', "\n", $pee);
@@ -258 +258 @@
  * @returns string
  */
-function __autop_newline_preservation_helper( $matches ) {
+function _autop_newline_preservation_helper( $matches ) {
     return str_replace("\n", "<WPPreserveNewline />", $matches[0]);
 }
@@ -1596 +1596 @@
     } else {
         $subject = str_replace('_', ' ', $matches[2]);
-        $subject = preg_replace_callback('#\=([0-9a-f]{2})#i', '__wp_iso_convert', $subject);
+        $subject = preg_replace_callback('#\=([0-9a-f]{2})#i', '_wp_iso_convert', $subject);
         return $subject;
     }
@@ -1608 +1608 @@
  * @param $match the preg_replace_callback matches array
  */
-function __wp_iso_convert( $match ) { 
+function _wp_iso_convert( $match ) { 
     return chr( hexdec( strtolower( $match[1] ) ) ); 
 } 

trunk/wp-includes/kses.php

@@ -547 +547 @@
     $pass_allowed_html = $allowed_html;
     $pass_allowed_protocols = $allowed_protocols;
-    return preg_replace_callback('%((<!--.*?(-->|$))|(<[^>]*(>|$)|>))%',
-        create_function('$match', 'global $pass_allowed_html, $pass_allowed_protocols; return wp_kses_split2($match[1], $pass_allowed_html, $pass_allowed_protocols);'), $string);
+    return preg_replace_callback( '%((<!--.*?(-->|$))|(<[^>]*(>|$)|>))%', '_wp_kses_split_callback', $string );
+}
+
+/**
+ * Callback for wp_kses_split.
+ *
+ * @since 3.1.0
+ * @access private
+ */
+function _wp_kses_split_callback( $match ) {
+    global $pass_allowed_html, $pass_allowed_protocols;
+    return wp_kses_split2( $match[1], $pass_allowed_html, $pass_allowed_protocols );
 }
 

trunk/wp-includes/post-template.php

@@ -224 +224 @@
     }
     if ( $preview ) // preview fix for javascript bug with foreign languages
-        $output =   preg_replace_callback('/\%u([0-9A-F]{4})/', '__convert_urlencoded_to_entities', $output);
+        $output =   preg_replace_callback('/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output);
 
     return $output;
@@ -237 +237 @@
  * @returns string
  */
-function __convert_urlencoded_to_entities($match) {
-    return '&#' . base_convert($match[1], 16, 10) . ';'; 
+function _convert_urlencoded_to_entities( $match ) {
+    return '&#' . base_convert( $match[1], 16, 10 ) . ';'; 
 }
 

trunk/wp-includes/post.php

@@ -1163 +1163 @@
         $object->labels['menu_name'] = $object->labels['name'];
 
-    $defaults = array_map( create_function( '$x', $object->hierarchical? 'return $x[1];' : 'return $x[0];' ), $nohier_vs_hier_defaults );
+    foreach ( $nohier_vs_hier_defaults as $key => $value )
+            $defaults[$key] = $object->hierarchical ? $value[1] : $value[0];
+
     $labels = array_merge( $defaults, $object->labels );
     return (object)$labels;