<!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>[BuddyPress][6448] trunk: Activate and Sign-up:</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 { 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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/6448">6448</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-10-22 08:00:13 +0000 (Mon, 22 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Activate and Sign-up:
* Resurrect bp_has_custom_activation_page() from 1.6 deprecation.
* Use bp_has_custom_activation_page() similarly to bp_has_custom_signup_page().
* Use static variable to prevent repeating logic multiple times per page load.
* Add phpdoc blocks.
* Use bp_locate_template() in bp_has_custom_activation_page() and bp_has_custom_signup_page() to more easily find whether a file exists in the correct location to provide template output.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoredeprecated16php">trunk/bp-core/deprecated/1.6.php</a></li>
<li><a href="#trunkbpmembersbpmemberstemplatephp">trunk/bp-members/bp-members-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoredeprecated16php"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/deprecated/1.6.php (6447 => 6448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/deprecated/1.6.php 2012-10-22 07:54:13 UTC (rev 6447)
+++ trunk/bp-core/deprecated/1.6.php 2012-10-22 08:00:13 UTC (rev 6448)
</span><span class="lines">@@ -82,18 +82,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Members functions
- */
-
-/**
- * @deprecated 1.6
- * @deprecated No longer used. Check for $bp->pages->activate->slug instead.
- */
-function bp_has_custom_activation_page() {
- _deprecated_function( __FUNCTION__, '1.6' );
-}
-
-/**
</del><span class="cx"> * Friends functions
</span><span class="cx"> */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-template.php (6447 => 6448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-template.php 2012-10-22 07:54:13 UTC (rev 6447)
+++ trunk/bp-members/bp-members-template.php 2012-10-22 08:00:13 UTC (rev 6448)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> * @since BuddyPress (1.5)
</span><span class="cx"> */
</span><span class="cx"> function bp_get_signup_slug() {
</span><del>- global $bp;
</del><ins>+ $bp = buddypress();
</ins><span class="cx">
</span><span class="cx"> if ( !empty( $bp->pages->register->slug ) )
</span><span class="cx"> $slug = $bp->pages->register->slug;
</span><span class="lines">@@ -966,17 +966,22 @@
</span><span class="cx">
</span><span class="cx"> /** Signup Form ***************************************************************/
</span><span class="cx">
</span><ins>+/**
+ * Do we have a working custom sign up page?
+ *
+ * @since BuddyPress (1.5)
+ *
+ * @uses bp_get_signup_slug() To make sure there is a slug assigned to the page
+ * @uses bp_locate_template() To make sure a template exists to provide output
+ * @return boolean True if page and template exist, false if not
+ */
</ins><span class="cx"> function bp_has_custom_signup_page() {
</span><del>- // if theme is not bp-default, theme compat is on
- // theme compat already bundles its own templates
- if ( ! bp_is_theme_bp_default() )
- return true;
</del><ins>+ static $has_page = false;
</ins><span class="cx">
</span><del>- // look in parent / child theme for custom registration templates
- if ( locate_template( array( 'register.php' ), false ) || locate_template( array( '/registration/register.php' ), false ) )
- return true;
</del><ins>+ if ( empty( $has_page ) )
+ $has_page = bp_get_signup_slug() && bp_locate_template( array( 'registration/register.php', 'members/register.php', 'register.php' ), false );
</ins><span class="cx">
</span><del>- return false;
</del><ins>+ return (bool) $has_page;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1000,17 +1005,33 @@
</span><span class="cx"> return apply_filters( 'bp_get_signup_page', $page );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Do we have a working custom activation page?
+ *
+ * @since BuddyPress (1.5)
+ *
+ * @uses bp_get_activate_slug() To make sure there is a slug assigned to the page
+ * @uses bp_locate_template() To make sure a template exists to provide output
+ * @return boolean True if page and template exist, false if not
+ */
+function bp_has_custom_activation_page() {
+ static $has_page = false;
+
+ if ( empty( $has_page ) )
+ $has_page = bp_get_activate_slug() && bp_locate_template( array( 'registration/activate.php', 'members/activate.php', 'activate.php' ), false );
+
+ return (bool) $has_page;
+}
+
</ins><span class="cx"> function bp_activation_page() {
</span><span class="cx"> echo bp_get_activation_page();
</span><span class="cx"> }
</span><span class="cx"> function bp_get_activation_page() {
</span><del>- global $bp;
-
- // Check the global directly to make sure the WP page exists in $bp->pages
- if ( !empty( $bp->pages->activate->slug ) )
- $page = trailingslashit( bp_get_root_domain() . '/' . $bp->pages->activate->slug );
- else
</del><ins>+ if ( bp_has_custom_activation_page() ) {
+ $page = trailingslashit( bp_get_root_domain() . '/' . bp_get_activate_slug() );
+ } else {
</ins><span class="cx"> $page = trailingslashit( bp_get_root_domain() ) . 'wp-activate.php';
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_get_activation_page', $page );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>