Changeset 44624 for trunk/src/wp-includes/functions.php

Timestamp:

01/16/2019 03:20:04 PM (15 months ago)

Author:

flixos90

Message:

Bootstrap/Load: Fix workaround to display admin link in PHP error template by introducing $link_url and $link_text arguments to wp_die().

This changeset removes the hack that was used before to display more complex HTML markup than a simple message in the default PHP error template via wp_die(). By removing HTML markup from the arguments passed to wp_die() it furthermore paves the way for supporting other content types than the default.

The message and arguments can be modified with new wp_php_error_message and wp_php_error_args filters respectively.

Furthermore this changeset fixes a few issues of functions not existing which could potentially have caused fatal errors when executed early in the WordPress bootstrap process.

Props flixos90, spacedmonkey.
See #45933, #44458.

File:

• trunk/src/wp-includes/functions.php (modified) (3 diffs)

trunk/src/wp-includes/functions.php

@@ -2934 +2934 @@
  * @since 4.1.0 The `$title` and `$args` parameters were changed to optionally accept
  *              an integer to be used as the response code.
+ * @since 5.1.0 The `$link_url` and `$link_text` arguments were added.
  *
  * @param string|WP_Error  $message Optional. Error message. If this is a WP_Error object,
@@ -2947 +2948 @@
  *
  *     @type int    $response       The HTTP response code. Default 200 for Ajax requests, 500 otherwise.
+ *     @type string $link_url       A URL to include a link to. Only works in combination with $link_text.
+ *                                  Default empty string.
+ *     @type string $link_text      A label for the link to include. Only works in combination with $link_url.
+ *                                  Default empty string.
  *     @type bool   $back_link      Whether to include a link to go back. Default false.
  *     @type string $text_direction The text direction. This is only useful internally, when WordPress
@@ -3034 +3039 @@
     } elseif ( is_string( $message ) ) {
         $message = "<p>$message</p>";
+    }
+
+    if ( ! empty( $r['link_url'] ) && ! empty( $r['link_text'] ) ) {
+        $link_url = $r['link_url'];
+        if ( function_exists( 'esc_url' ) ) {
+            $link_url = esc_url( $link_url );
+        }
+        $link_text = $r['link_text'];
+        $message  .= "\n<p><a href='{$link_url}'>{$link_text}</a></p>";
     }