Changeset 45909

Timestamp:

08/29/2019 07:52:43 AM (6 years ago)

Author:

mikeschroder

Message:

Administration: Output valid HTML when wp_die() is called.

To better support HTML and string calls to wp_die() without
outputting invalid HTML, wraps error messages in <div> rather than <p>.

Adds .wp-die-message CSS class for styling.

Props dinhtungdu, jeremyfelt, audrasjb, SergeyBiryukov, afercia, audrasjb, noisysocks.
Fixes #47580.

Location:

trunk/src

Files:

• index.php (modified) (1 diff)
• wp-admin/css/common.css (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)

trunk/src/index.php

@@ -31 +31 @@
 
 // Die with an error message
-$die = __( 'You are running WordPress without JavaScript and CSS files. These need to be built.' ) . '</p>';
+$die = sprintf(
+    '<p>%s</p>',
+    __( 'You are running WordPress without JavaScript and CSS files. These need to be built.' )
+);
 
 $die .= '<p>' . sprintf(

trunk/src/wp-admin/css/common.css

@@ -459 +459 @@
     padding: 0;
     white-space: nowrap;
+}
+
+.wp-die-message {
+    font-size: 13px;
+    line-height: 1.5;
+    margin: 1em 0;
 }
 

trunk/src/wp-includes/functions.php

@@ -3192 +3192 @@
             );
             $message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $message ) . "</li>\n\t</ul>";
-        } else {
-            $message = "<p>$message</p>";
-        }
+        }
+
+        $message = sprintf(
+            '<div class="wp-die-message">%s</div>',
+            $message
+        );
     }
 
@@ -3264 +3267 @@
             margin-top: 50px;
         }
-        #error-page p {
+        #error-page p,
+        #error-page .wp-die-message {
             font-size: 14px;
             line-height: 1.5;