<!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>[12321] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support: Support: Create `Edit Account` screen.</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/12321">12321</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/12321","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-12-13 18:31:15 +0000 (Tue, 13 Dec 2022)</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'>Support: Create `Edit Account` screen.
This commits the parts of https://github.com/WordPress/wordpress.org/pull/114 that don't affect production users, and can therefore be deployed now. Adding a link to this screen and removing the email/password settings from the built-in Edit screen will needs to wait until the WPORG Two Factor UI is done.
The rewrite rule was added in `<a href="http://meta.trac.wordpress.org/changeset/19711">r19711</a>-dotorg`.
See https://github.com/WordPress/wporg-two-factor/issues/26</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentsingleuserphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-single-user.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressformusereditaccountphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-user-edit-account.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpresscontentsingleuserphp"></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-support/bbpress/content-single-user.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-support/bbpress/content-single-user.php 2022-12-12 20:28:37 UTC (rev 12320)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/content-single-user.php 2022-12-13 18:31:15 UTC (rev 12321)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,6 +38,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( wporg_support_is_single_user_reviews() ) bbp_get_template_part( 'user', 'reviews-written' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( wporg_support_is_single_user_topics_replied_to() ) bbp_get_template_part( 'user', 'topics-replied-to' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bbp_is_single_user_edit() ) bbp_get_template_part( 'form', 'user-edit' ); ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( wporg_bbp_is_single_user_edit_account() ) bbp_get_template_part( 'form', 'user-edit-account' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bbp_is_single_user_profile() ) bbp_get_template_part( 'user', 'profile' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportbbpressformusereditaccountphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-user-edit-account.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-support/bbpress/form-user-edit-account.php (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-user-edit-account.php 2022-12-13 18:31:15 UTC (rev 12321)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,16 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/*
+ * This contains the Account section from the default `form-user-edit.php` on a separate screen. It's populated
+ * dynamically from the WPORG Two Factor plugin.
+ */
+
+?>
+
+<div id="bbp-your-profile">
+ <h2 class="entry-title">
+ <?php esc_html_e( 'Account', 'bbpress' ); ?>
+ </h2>
+
+ <?php do_action( 'bbp_user_edit_account' ); ?>
+</div>
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/form-user-edit-account.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportfunctionsphp"></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-support/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-support/functions.php 2022-12-12 20:28:37 UTC (rev 12320)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php 2022-12-13 18:31:15 UTC (rev 12321)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -800,7 +800,47 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_after_theme_compat_reset_post_parse_args', 'wporg_support_set_is_single_on_single_replies' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Add query vars
+ */
+function wporg_add_query_vars( array $vars ) : array {
+ // For https://wordpress.org/support/users/foo/edit/account/.
+ // See `site-support.php` for the rewrite rule.
+ $vars[] = 'edit_account';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $vars;
+}
+add_filter( 'query_vars', 'wporg_add_query_vars' );
+
+/**
+ * Detect if the current request is for editing a bbPress Account
+ *
+ * The Account screen is a custom modification where the security settings are moved to a separate screen.
+ */
+function wporg_bbp_is_single_user_edit_account() : bool {
+ global $wp_query;
+
+ return $wp_query->get( 'bbp_user', false ) && $wp_query->get( 'edit_account', false );
+}
+
+/**
+ * Determine if the current request is to show a profile.
+ *
+ * This is necessary because `bbp_parse_query()` assumes that the current page is a Profile if it doesn't match
+ * any of the other built-in pages, rather than checking that the current page actually is a request for a profile.
+ */
+function wporg_is_single_user_profile( bool $is_single_user_profile ) : bool {
+ // True for https://wordpress.org/support/users/foo/ but not https://wordpress.org/support/users/foo/edit/account/.
+ // See `site-support.php` for the rewrite rule.
+ if ( $is_single_user_profile ) {
+ $is_single_user_profile = ! wporg_bbp_is_single_user_edit_account();
+ }
+
+ return $is_single_user_profile;
+}
+add_filter( 'bbp_is_single_user_profile', 'wporg_is_single_user_profile' );
+
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** bb Base *******************************************************************/
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function bb_base_search_form() {
</span></span></pre>
</div>
</div>
</body>
</html>