<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[10845] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login: Login: Add the 'WordPress.org is ...' text via a action/filter instead of hard-coding it into the login template.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/10845">10845</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/10845","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-03-25 08:52:21 +0000 (Thu, 25 Mar 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Login: Add the 'WordPress.org is ...' text via a action/filter instead of hard-coding it into the login template.
This allows for the text to be displayed when landing on the wp-login.php page as well.
See <a href="http://meta.trac.wordpress.org/ticket/5590">#5590</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginloginphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php 2021-03-25 07:32:50 UTC (rev 10844)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php 2021-03-25 08:52:21 UTC (rev 10845)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -417,3 +417,56 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'login_title', 'wporg_login_title' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+function wporg_login_wporg_is_starpress( $redirect_to = '' ) {
+
+ $message = '';
+
+ $from = 'wordpress.org';
+ if ( $redirect_to ) {
+ $from = $redirect_to;
+ } elseif ( !empty( $_REQUEST['from'] ) ) {
+ $from = $_REQUEST['from'];
+ } elseif ( !empty( $_REQUEST['redirect_to'] ) ) {
+ $from = $_REQUEST['redirect_to'];
+ }
+
+ if ( false !== stripos( $from, 'buddypress.org' ) ) {
+ $message .= '<strong>' . __( 'BuddyPress is part of WordPress.org', 'wporg' ) . '</strong><br>';
+ $message .= __( 'Log in to your WordPress.org account to contribute to BuddyPress, or get help in the support forums.', 'wporg' );
+
+ } elseif ( false !== stripos( $from, 'bbpress.org' ) ) {
+ $message .= '<strong>' . __( 'bbPress is part of WordPress.org', 'wporg' ) . '</strong><br>';
+ $message .= __( 'Log in to your WordPress.org account to contribute to bbPress, or get help in the support forums.', 'wporg' );
+
+ } elseif ( false !== stripos( $from, 'wordcamp.org' ) ) {
+ $message .= '<strong>' . __( 'WordCamp is part of WordPress.org', 'wporg' ) . '</strong><br>';
+ $message .= __( 'Log in to your WordPress.org account to contribute to WordCamps and meetups around the globe.', 'wporg' );
+
+ } else {
+ $message .= __( 'Log in to your WordPress.org account to contribute to WordPress, get help in the support forum, or rate and review themes and plugins.', 'wporg' );
+ }
+
+ return $message;
+}
+
+// This is the action in the top of `wp_login_form()`, which is not used on wp-login.php, see below.
+function wporg_login_form_top( $message ) {
+ $message .= '<p class="intro">' . wporg_login_wporg_is_starpress() . '</p>';
+
+ return $message;
+}
+add_filter( 'login_form_top', 'wporg_login_form_top' );
+
+// This is the login messages, which is displayed on wp-login.php, which does not use wp_login_form() or it's actions.
+function wporg_login_message( $errors, $redirect_to ) {
+ $errors->add(
+ 'pre_login_message',
+ ( isset( $_GET['loggedout'] ) ? '<br>' : '' ) .
+ wporg_login_wporg_is_starpress( $redirect_to ),
+ 'message' // This is not an error..
+ );
+
+ return $errors;
+}
+add_filter( 'wp_login_errors', 'wporg_login_message', 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgloginloginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/login.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/login.php 2021-03-25 07:32:50 UTC (rev 10844)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/login.php 2021-03-25 08:52:21 UTC (rev 10845)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,28 +6,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> get_header();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-$from = $_GET['from'] ?? 'wordpress.org';
</del><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p class="intro"><?php
-if ( false !== stripos( $from, 'buddypress.org' ) ) {
- echo '<strong>' . __( 'BuddyPress is part of WordPress.org', 'wporg' ) . '</strong><br>';
- _e( 'Log in to your WordPress.org account to contribute to BuddyPress, or get help in the support forums.', 'wporg' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} elseif ( false !== stripos( $from, 'bbpress.org' ) ) {
- echo '<strong>' . __( 'bbPress is part of WordPress.org', 'wporg' ) . '</strong><br>';
- _e( 'Log in to your WordPress.org account to contribute to bbPress, or get help in the support forums.', 'wporg' );
-
-} elseif ( false !== stripos( $from, 'wordcamp.org' ) ) {
- echo '<strong>' . __( 'WordCamp is part of WordPress.org', 'wporg' ) . '</strong><br>';
- _e( 'Log in to your WordPress.org account to contribute to WordCamps and meetups around the globe.', 'wporg' );
-
-} else {
- _e( 'Log in to your WordPress.org account to contribute to WordPress, get help in the support forum, or rate and review themes and plugins.', 'wporg' );
-}
-?>
-</p>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <?php wp_login_form(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p id="nav">
</span></span></pre>
</div>
</div>
</body>
</html>