Ticket #37748: 37748.patch

wp-admin/admin-footer.php

@@ -83 +83 @@
  *
  * @param string $hook_suffix The current admin page.
  */
-do_action( "admin_print_footer_scripts-$hook_suffix" );
+do_action( "admin_print_footer_scripts-{$hook_suffix}" );
 
 /**
  * Prints any scripts and data queued for the footer.
@@ -103 +103 @@
  * @global string $hook_suffix
  * @param string $hook_suffix The current admin page.
  */
-do_action( "admin_footer-$hook_suffix" );
+do_action( "admin_footer-{$hook_suffix}" );
 
 // get_site_option() won't exist when auto upgrading from <= 2.7
 if ( function_exists('get_site_option') ) {

wp-admin/admin-header.php

@@ -96 +96 @@
  *
  * @since 2.6.0
  */
-do_action( "admin_print_styles-$hook_suffix" );
+do_action( "admin_print_styles-{$hook_suffix}" );
 
 /**
  * Fires when styles are printed for all admin pages.
@@ -110 +110 @@
  *
  * @since 2.1.0
  */
-do_action( "admin_print_scripts-$hook_suffix" );
+do_action( "admin_print_scripts-{$hook_suffix}" );
 
 /**
  * Fires when scripts are printed for all admin pages.
@@ -127 +127 @@
  *
  * @since 2.1.0
  */
-do_action( "admin_head-$hook_suffix" );
+do_action( "admin_head-{$hook_suffix}" );
 
 /**
  * Fires in head section for all admin pages.

wp-admin/admin.php

@@ -209 +209 @@
                  *
                  * @since 2.1.0
                  */
-                do_action( 'load-' . $page_hook );
+                do_action( "load-{$page_hook}" );
                 if (! isset($_GET['noheader']))
                         require_once(ABSPATH . 'wp-admin/admin-header.php');
 
@@ -239 +239 @@
                  *
                  * @since 1.5.0
                  */
-                do_action( 'load-' . $plugin_page );
+                do_action( "load-{$plugin_page}" );
 
                 if ( !isset($_GET['noheader']))
                         require_once(ABSPATH . 'wp-admin/admin-header.php');
@@ -278 +278 @@
          *
          * @since 3.5.0
          */
-        do_action( 'load-importer-' . $importer );
+        do_action( "load-importer-{$importer}" );
 
         $parent_file = 'tools.php';
         $submenu_file = 'import.php';
@@ -326 +326 @@
          *
          * @since 2.1.0
          */
-        do_action( 'load-' . $pagenow );
+        do_action( "load-{$pagenow}" );
 
         /*
          * The following hooks are fired to ensure backward compatibility.

wp-admin/edit-form-advanced.php

@@ -331 +331 @@
  *
  * @param WP_Post $post Post object.
  */
-do_action( 'add_meta_boxes_' . $post_type, $post );
+do_action( "add_meta_boxes_{$post_type}", $post );
 
 /**
  * Fires after meta boxes have been added.

wp-includes/option.php

@@ -534 +534 @@
                  *
                  * @param string $option Name of the deleted option.
                  */
-                do_action( "delete_option_$option", $option );
+                do_action( "delete_option_{$option}", $option );
 
                 /**
                  * Fires after an option has been deleted.
@@ -568 +568 @@
          *
          * @param string $transient Transient name.
          */
-        do_action( 'delete_transient_' . $transient, $transient );
+        do_action( "delete_transient_{$transient}", $transient );
 
         if ( wp_using_ext_object_cache() ) {
                 $result = wp_cache_delete( $transient, 'transient' );
@@ -758 +758 @@
                  * @param int    $expiration Time until expiration in seconds.
                  * @param string $transient  The name of the transient.
                  */
-                do_action( 'set_transient_' . $transient, $value, $expiration, $transient );
+                do_action( "set_transient_{$transient}", $value, $expiration, $transient );
 
                 /**
                  * Fires after the value for a transient has been set.
@@ -1271 +1271 @@
                  * @param string $option Name of the network option.
                  * @param mixed  $value  Value of the network option.
                  */
-                do_action( 'add_site_option_' . $option, $option, $value );
+                do_action( "add_site_option_{$option}", $option, $value );
 
                 /**
                  * Fires after a network option has been successfully added.
@@ -1327 +1327 @@
          *
          * @param string $option Option name.
          */
-        do_action( 'pre_delete_site_option_' . $option, $option );
+        do_action( "pre_delete_site_option_{$option}", $option );
 
         if ( ! is_multisite() ) {
                 $result = delete_option( $option );
@@ -1354 +1354 @@
                  *
                  * @param string $option Name of the network option.
                  */
-                do_action( 'delete_site_option_' . $option, $option );
+                do_action( "delete_site_option_{$option}", $option );
 
                 /**
                  * Fires after a network option has been deleted.
@@ -1462 +1462 @@
                  * @param mixed  $value     Current value of the network option.
                  * @param mixed  $old_value Old value of the network option.
                  */
-                do_action( 'update_site_option_' . $option, $option, $value, $old_value );
+                do_action( "update_site_option_{$option}", $option, $value, $old_value );
 
                 /**
                  * Fires after the value of a network option has been successfully updated.
@@ -1500 +1500 @@
          *
          * @param string $transient Transient name.
          */
-        do_action( 'delete_site_transient_' . $transient, $transient );
+        do_action( "delete_site_transient_{$transient}", $transient );
 
         if ( wp_using_ext_object_cache() ) {
                 $result = wp_cache_delete( $transient, 'site-transient' );
@@ -1671 +1671 @@
                  * @param int    $expiration Time until expiration in seconds.
                  * @param string $transient  Transient name.
                  */
-                do_action( 'set_site_transient_' . $transient, $value, $expiration, $transient );
+                do_action( "set_site_transient_{$transient}", $value, $expiration, $transient );
 
                 /**
                  * Fires after the value for a site transient has been set.