Changeset 20063

Timestamp:

03/01/2012 09:35:15 PM (14 years ago)

Author:

nacin

Message:

New wp_die_app_handler context in wp_die() for APP requests. Introduces _scalar_wp_die_handler() as a generic handler that wraps die(), for use by plugins. Move deprecated function to the end of the wp-app.php file (same as xmlrpc.php). see #20042.

Location:

trunk

Files:

• wp-app.php (modified) (2 diffs)
• wp-includes/class-wp-atom-server.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)

trunk/wp-app.php

@@ -27 +27 @@
 $_SERVER['PATH_INFO'] = preg_replace( '/.*\/wp-app\.php/', '', $_SERVER['REQUEST_URI'] );
 
+// Allow for a plugin to insert a different class to handle requests.
+$wp_atom_server_class = apply_filters('wp_atom_server_class', 'wp_atom_server');
+$wp_atom_server = new $wp_atom_server_class;
+
+// Handle the request
+$wp_atom_server->handle_request();
+
+exit;
+
 /**
  * Writes logging info to a file.
@@ -43 +52 @@
             error_log( $label . ' - ' . $message );
 }
-
-// Allow for a plugin to insert a different class to handle requests.
-$wp_atom_server_class = apply_filters('wp_atom_server_class', 'wp_atom_server');
-$wp_atom_server = new $wp_atom_server_class;
-
-// Handle the request
-$wp_atom_server->handle_request();

trunk/wp-includes/class-wp-atom-server.php

@@ -176 +176 @@
                         'DELETE' => 'delete_attachment'),
         );
-
-        add_filter( 'wp_die_handler', array( $this, 'return_atom_die_handler' ) );
-    }
-
-    /**
-     * Override die handler
-     * @return callback
-     */
-    public function return_atom_die_handler() {
-        return array( $this, 'atom_die_handler' );
-    }
-
-    /**
-     * Die with a message.  Only accept strings, no WP_Error objects yet
-     * @param string $message
-     * @return void
-     */
-    public function atom_die_handler( $message ) {
-        if ( is_scalar( $message ) )
-            die( (string) $message );
-        die();
     }
 

trunk/wp-includes/functions.php

@@ -1977 +1977 @@
     elseif ( defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST )
         $function = apply_filters( 'wp_die_xmlrpc_handler', '_xmlrpc_wp_die_handler' );
+    elseif ( defined( 'APP_REQUEST' ) && APP_REQUEST )
+        $function = apply_filters( 'wp_die_app_bandler', '_scalar_wp_die_handler' );
     else
         $function = apply_filters( 'wp_die_handler', '_default_wp_die_handler' );
@@ -2180 +2182 @@
         die( (string) $message );
     die( '0' );
+}
+
+/**
+ * Kill WordPress execution.
+ *
+ * This is the handler for wp_die when processing APP requests.
+ *
+ * @since 3.4.0
+ * @access private
+ *
+ * @param string $message Optional. Response to print.
+ */
+function _scalar_wp_die_handler( $message = '' ) {
+    if ( is_scalar( $message ) )
+        die( (string) $message );
+    die();
 }