<!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][6249] trunk: Moves bp_displayed_user_id() and bp_loggedin_user_id() to Core component</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/6249">6249</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2012-08-08 17:13:00 +0000 (Wed, 08 Aug 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Moves bp_displayed_user_id() and bp_loggedin_user_id() to Core component
The function bp_displayed_user_id() and bp_loggedin_user_id() are referenced
throughout BuddyPress's Core component when doing things like checking page
type. In certain circumstances, these checks might happen after the Core
component is loaded, but before the Members component is loaded. For this
reason, it's important that the functions live in Core rather than Members,
to avoid fatal errors.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4403">#4403</a>
Props steve7777</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatephp">trunk/bp-core/bp-core-template.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="trunkbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-template.php (6248 => 6249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-template.php 2012-08-08 17:12:20 UTC (rev 6248)
+++ trunk/bp-core/bp-core-template.php 2012-08-08 17:13:00 UTC (rev 6249)
</span><span class="lines">@@ -751,6 +751,42 @@
</span><span class="cx"> return apply_filters( 'bp_get_search_slug', BP_SEARCH_SLUG );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Get the id of the currently displayed user
+ *
+ * @uses apply_filters() Filter 'bp_displayed_user_id' to change this value
+ * @return int
+ */
+function bp_displayed_user_id() {
+
+ static $id = 0;
+
+ if ( empty( $id ) ) {
+ global $bp;
+ $id = !empty( $bp->displayed_user->id ) ? $bp->displayed_user->id : 0;
+ }
+
+ return apply_filters( 'bp_displayed_user_id', $id );
+}
+
+/**
+ * Get the id of the currently logged-in user
+ *
+ * @uses apply_filters() Filter 'bp_loggedin_user_id' to change this value
+ * @return int
+ */
+function bp_loggedin_user_id() {
+
+ static $id = 0;
+
+ if ( empty( $id ) ) {
+ global $bp;
+ $id = !empty( $bp->loggedin_user->id ) ? $bp->loggedin_user->id : 0;
+ }
+
+ return apply_filters( 'bp_loggedin_user_id', $id );
+}
+
</ins><span class="cx"> /** is_() functions to determine the current page *****************************/
</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 (6248 => 6249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-template.php 2012-08-08 17:12:20 UTC (rev 6248)
+++ trunk/bp-members/bp-members-template.php 2012-08-08 17:13:00 UTC (rev 6249)
</span><span class="lines">@@ -863,30 +863,6 @@
</span><span class="cx"> }
</span><span class="cx"> function bp_user_link() { bp_displayed_user_domain(); } // Deprecated.
</span><span class="cx">
</span><del>-function bp_displayed_user_id() {
-
- static $id = 0;
-
- if ( empty( $id ) ) {
- global $bp;
- $id = !empty( $bp->displayed_user->id ) ? $bp->displayed_user->id : 0;
- }
-
- return apply_filters( 'bp_displayed_user_id', $id );
-}
-
-function bp_loggedin_user_id() {
-
- static $id = 0;
-
- if ( empty( $id ) ) {
- global $bp;
- $id = !empty( $bp->loggedin_user->id ) ? $bp->loggedin_user->id : 0;
- }
-
- return apply_filters( 'bp_loggedin_user_id', $id );
-}
-
</del><span class="cx"> function bp_current_user_id() { return bp_displayed_user_id(); }
</span><span class="cx">
</span><span class="cx"> function bp_displayed_user_domain() {
</span></span></pre>
</div>
</div>
</body>
</html>