Changeset 16365

Timestamp:

11/14/2010 03:50:02 PM (14 years ago)

Author:

scribu

Message:

Improve hook readability via curly brackets. Props jjj for initial patch. Fixes #15422

Location:

trunk

Files:

• wp-admin/includes/class-wp-terms-list-table.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (1 diff)
• wp-admin/includes/widgets.php (modified) (1 diff)
• wp-includes/comment.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/post.php (modified) (6 diffs)
• wp-includes/taxonomy.php (modified) (3 diffs)
• wp-includes/user.php (modified) (4 diffs)

trunk/wp-admin/includes/class-wp-terms-list-table.php

@@ -251 +251 @@
 
         $actions = apply_filters( 'tag_row_actions', $actions, $tag );
-        $actions = apply_filters( "${taxonomy}_row_actions", $actions, $tag );
+        $actions = apply_filters( "{$taxonomy}_row_actions", $actions, $tag );
 
         $out .= $this->row_actions( $actions );

trunk/wp-admin/includes/post.php

@@ -1023 +1023 @@
         if ( !empty($uri) )
             $uri .= '/';
-        $permalink = str_replace('%pagename%', "${uri}%pagename%", $permalink);
+        $permalink = str_replace('%pagename%', "{$uri}%pagename%", $permalink);
     }
 

trunk/wp-admin/includes/widgets.php

@@ -99 +99 @@
     $hidden = isset($params[0]['_hide']) ? ' style="display:none;"' : '';
 
-    $params[0]['before_widget'] = "<div id='widget-${i}_$id' class='widget'$hidden>";
+    $params[0]['before_widget'] = "<div id='widget-{$i}_{$id}' class='widget'$hidden>";
     $params[0]['after_widget'] = "</div>";
     $params[0]['before_title'] = "%BEG_OF_TITLE%"; // deprecated

trunk/wp-includes/comment.php

@@ -1162 +1162 @@
     if ( $new_status != $old_status ) {
         do_action('transition_comment_status', $new_status, $old_status, $comment);
-        do_action("comment_${old_status}_to_$new_status", $comment);
-    }
-    do_action("comment_${new_status}_$comment->comment_type", $comment->comment_ID, $comment);
+        do_action("comment_{$old_status}_to_{$new_status}", $comment);
+    }
+    do_action("comment_{$new_status}_{$comment->comment_type}", $comment->comment_ID, $comment);
 }
 

trunk/wp-includes/functions.php

@@ -4227 +4227 @@
 
     if ( $context != '' ) {
-        $extra_headers = apply_filters( "extra_$context".'_headers', array() );
+        $extra_headers = apply_filters( "extra_{$context}".'_headers', array() );
 
         $extra_headers = array_flip( $extra_headers );

trunk/wp-includes/general-template.php

@@ -1122 +1122 @@
         $thisyear = ''.intval(substr($m, 0, 4));
         $d = (($w - 1) * 7) + 6; //it seems MySQL's weeks disagree with PHP's
-        $thismonth = $wpdb->get_var("SELECT DATE_FORMAT((DATE_ADD('${thisyear}0101', INTERVAL $d DAY) ), '%m')");
+        $thismonth = $wpdb->get_var("SELECT DATE_FORMAT((DATE_ADD('{$thisyear}0101', INTERVAL $d DAY) ), '%m')");
     } elseif ( !empty($m) ) {
         $thisyear = ''.intval(substr($m, 0, 4));

trunk/wp-includes/post.php

@@ -1609 +1609 @@
  *
  * @since 2.3.0
- * @uses apply_filters() Calls 'edit_$field' and '${field_no_prefix}_edit_pre' passing $value and
+ * @uses apply_filters() Calls 'edit_$field' and '{$field_no_prefix}_edit_pre' passing $value and
  *  $post_id if $context == 'edit' and field name prefix == 'post_'.
  *
  * @uses apply_filters() Calls 'edit_post_$field' passing $value and $post_id if $context == 'db'.
  * @uses apply_filters() Calls 'pre_$field' passing $value if $context == 'db' and field name prefix == 'post_'.
- * @uses apply_filters() Calls '${field}_pre' passing $value if $context == 'db' and field name prefix != 'post_'.
+ * @uses apply_filters() Calls '{$field}_pre' passing $value if $context == 'db' and field name prefix != 'post_'.
  *
  * @uses apply_filters() Calls '$field' passing $value, $post_id and $context if $context == anything
@@ -1653 +1653 @@
 
         if ( $prefixed ) {
-            $value = apply_filters("edit_$field", $value, $post_id);
+            $value = apply_filters("edit_{$field}", $value, $post_id);
             // Old school
-            $value = apply_filters("${field_no_prefix}_edit_pre", $value, $post_id);
+            $value = apply_filters("{$field_no_prefix}_edit_pre", $value, $post_id);
         } else {
-            $value = apply_filters("edit_post_$field", $value, $post_id);
+            $value = apply_filters("edit_post_{$field}", $value, $post_id);
         }
 
@@ -1670 +1670 @@
     } else if ( 'db' == $context ) {
         if ( $prefixed ) {
-            $value = apply_filters("pre_$field", $value);
-            $value = apply_filters("${field_no_prefix}_save_pre", $value);
+            $value = apply_filters("pre_{$field}", $value);
+            $value = apply_filters("{$field_no_prefix}_save_pre", $value);
         } else {
-            $value = apply_filters("pre_post_$field", $value);
-            $value = apply_filters("${field}_pre", $value);
+            $value = apply_filters("pre_post_{$field}", $value);
+            $value = apply_filters("{$field}_pre", $value);
         }
     } else {
@@ -1681 +1681 @@
             $value = apply_filters($field, $value, $post_id, $context);
         else
-            $value = apply_filters("post_$field", $value, $post_id, $context);
+            $value = apply_filters("post_{$field}", $value, $post_id, $context);
     }
 
@@ -2924 +2924 @@
  * @uses do_action() Calls 'transition_post_status' on $new_status, $old_status and
  *  $post if there is a status change.
- * @uses do_action() Calls '${old_status}_to_$new_status' on $post if there is a status change.
- * @uses do_action() Calls '${new_status}_$post->post_type' on post ID and $post.
+ * @uses do_action() Calls '{$old_status}_to_{$new_status}' on $post if there is a status change.
+ * @uses do_action() Calls '{$new_status}_{$post->post_type}' on post ID and $post.
  *
  * @param string $new_status Transition to this post status.
@@ -2933 +2933 @@
 function wp_transition_post_status($new_status, $old_status, $post) {
     do_action('transition_post_status', $new_status, $old_status, $post);
-    do_action("${old_status}_to_$new_status", $post);
-    do_action("${new_status}_$post->post_type", $post->ID, $post);
+    do_action("{$old_status}_to_{$new_status}", $post);
+    do_action("{$new_status}_{$post->post_type}", $post->ID, $post);
 }
 

trunk/wp-includes/taxonomy.php

@@ -1384 +1384 @@
 
     if ( 'edit' == $context ) {
-        $value = apply_filters("edit_term_$field", $value, $term_id, $taxonomy);
-        $value = apply_filters("edit_${taxonomy}_$field", $value, $term_id);
+        $value = apply_filters("edit_term_{$field}", $value, $term_id, $taxonomy);
+        $value = apply_filters("edit_{$taxonomy}_{$field}", $value, $term_id);
         if ( 'description' == $field )
             $value = format_to_edit($value);
@@ -1391 +1391 @@
             $value = esc_attr($value);
     } else if ( 'db' == $context ) {
-        $value = apply_filters("pre_term_$field", $value, $taxonomy);
-        $value = apply_filters("pre_${taxonomy}_$field", $value);
+        $value = apply_filters("pre_term_{$field}", $value, $taxonomy);
+        $value = apply_filters("pre_{$taxonomy}_{$field}", $value);
         // Back compat filters
         if ( 'slug' == $field )
@@ -1398 +1398 @@
 
     } else if ( 'rss' == $context ) {
-        $value = apply_filters("term_${field}_rss", $value, $taxonomy);
-        $value = apply_filters("${taxonomy}_${field}_rss", $value);
+        $value = apply_filters("term_{$field}_rss", $value, $taxonomy);
+        $value = apply_filters("{$taxonomy}_{$field}_rss", $value);
     } else {
         // Use display filters by default.
-        $value = apply_filters("term_$field", $value, $term_id, $taxonomy, $context);
-        $value = apply_filters("${taxonomy}_$field", $value, $term_id, $context);
+        $value = apply_filters("term_{$field}", $value, $term_id, $taxonomy, $context);
+        $value = apply_filters("{$taxonomy}_{$field}", $value, $term_id, $context);
     }
 

trunk/wp-includes/user.php

@@ -1149 +1149 @@
  *
  * @since 2.3.0
- * @uses apply_filters() Calls 'edit_$field' and '${field_no_prefix}_edit_pre' passing $value and
+ * @uses apply_filters() Calls 'edit_$field' and '{$field_no_prefix}_edit_pre' passing $value and
  *  $user_id if $context == 'edit' and field name prefix == 'user_'.
  *
  * @uses apply_filters() Calls 'edit_user_$field' passing $value and $user_id if $context == 'db'.
  * @uses apply_filters() Calls 'pre_$field' passing $value if $context == 'db' and field name prefix == 'user_'.
- * @uses apply_filters() Calls '${field}_pre' passing $value if $context == 'db' and field name prefix != 'user_'.
+ * @uses apply_filters() Calls '{$field}_pre' passing $value if $context == 'db' and field name prefix != 'user_'.
  *
  * @uses apply_filters() Calls '$field' passing $value, $user_id and $context if $context == anything
@@ -1187 +1187 @@
     if ( 'edit' == $context ) {
         if ( $prefixed ) {
-            $value = apply_filters("edit_$field", $value, $user_id);
+            $value = apply_filters("edit_{$field}", $value, $user_id);
         } else {
-            $value = apply_filters("edit_user_$field", $value, $user_id);
+            $value = apply_filters("edit_user_{$field}", $value, $user_id);
         }
 
@@ -1198 +1198 @@
     } else if ( 'db' == $context ) {
         if ( $prefixed ) {
-            $value = apply_filters("pre_$field", $value);
+            $value = apply_filters("pre_{$field}", $value);
         } else {
-            $value = apply_filters("pre_user_$field", $value);
+            $value = apply_filters("pre_user_{$field}", $value);
         }
     } else {
@@ -1207 +1207 @@
             $value = apply_filters($field, $value, $user_id, $context);
         else
-            $value = apply_filters("user_$field", $value, $user_id, $context);
+            $value = apply_filters("user_{$field}", $value, $user_id, $context);
     }