<!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][3802] trunk/bp-core/bp-core-functions.php: Prevent error when no page_meta is found</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>3802</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-21 14:45:47 +0000 (Fri, 21 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prevent error when no page_meta is found</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (3801 => 3802)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2011-01-21 14:30:22 UTC (rev 3801)
+++ trunk/bp-core/bp-core-functions.php 2011-01-21 14:45:47 UTC (rev 3802)
</span><span class="lines">@@ -44,41 +44,32 @@
</span><span class="cx"> // Set pages as standard class
</span><span class="cx"> $pages = new stdClass;
</span><span class="cx">
</span><del>- // When upgrading to BP 1.3+ from a version of BP that does not use WP
- // pages, $bp->pages must be populated with dummy info to avoid crashing the
- // site while the db is upgraded.
- if ( !$page_ids = bp_core_get_page_meta() ) {
- foreach ( $bp->active_components as $component ) {
- $pages->{$component->id}->name = $component->id;
- $pages->{$component->id}->slug = $component->id;
- $pages->{$component->id}->id = $component->id;
- }
</del><ins>+ // Get pages and IDs
+ if ( $page_ids = bp_core_get_page_meta() ) {
</ins><span class="cx">
</span><del>- return $pages;
- }
</del><ins>+ $posts_table_name = is_multisite() && !defined( 'BP_ENABLE_MULTIBLOG' ) ? $wpdb->get_blog_prefix( BP_ROOT_BLOG ) . 'posts' : $wpdb->posts;
+ $page_ids_sql = implode( ',', (array)$page_ids );
+ $page_names = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM {$posts_table_name} WHERE ID IN ({$page_ids_sql}) " ) );
</ins><span class="cx">
</span><del>- $posts_table_name = is_multisite() && !defined( 'BP_ENABLE_MULTIBLOG' ) ? $wpdb->get_blog_prefix( BP_ROOT_BLOG ) . 'posts' : $wpdb->posts;
- $page_ids_sql = implode( ',', (array)$page_ids );
- $page_names = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM {$posts_table_name} WHERE ID IN ({$page_ids_sql}) " ) );
</del><ins>+ foreach ( (array)$page_ids as $key => $page_id ) {
+ foreach ( (array)$page_names as $page_name ) {
+ if ( $page_name->ID == $page_id ) {
+ $pages->{$key}->name = $page_name->post_name;
+ $pages->{$key}->id = $page_name->ID;
+ $slug[] = $page_name->post_name;
</ins><span class="cx">
</span><del>- foreach ( (array)$page_ids as $key => $page_id ) {
- foreach ( (array)$page_names as $page_name ) {
- if ( $page_name->ID == $page_id ) {
- $pages->{$key}->name = $page_name->post_name;
- $pages->{$key}->id = $page_name->ID;
- $slug[] = $page_name->post_name;
</del><ins>+ // Get the slug
+ while ( $page_name->post_parent != 0 ) {
+ $parent = $wpdb->get_results( $wpdb->prepare( "SELECT post_name, post_parent FROM {$posts_table_name} WHERE ID = %d", $page_name->post_parent ) );
+ $slug[] = $parent[0]->post_name;
+ $page_name->post_parent = $parent[0]->post_parent;
+ }
</ins><span class="cx">
</span><del>- // Get the slug
- while ( $page_name->post_parent != 0 ) {
- $parent = $wpdb->get_results( $wpdb->prepare( "SELECT post_name, post_parent FROM {$posts_table_name} WHERE ID = %d", $page_name->post_parent ) );
- $slug[] = $parent[0]->post_name;
- $page_name->post_parent = $parent[0]->post_parent;
</del><ins>+ $pages->{$key}->slug = implode( '/', array_reverse( (array)$slug ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $pages->{$key}->slug = implode( '/', array_reverse( (array)$slug ) );
</del><ins>+ unset( $slug );
</ins><span class="cx"> }
</span><del>-
- unset( $slug );
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>