<!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][7798] trunk: Set a switch to retain ye olde `bp-default` theme if it's been activated previously.</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 { 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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7798">7798</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-02-05 19:40:14 +0000 (Wed, 05 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Set a switch to retain ye olde `bp-default` theme if it's been activated previously. Fixes issues with theme switching, and `bp-default` disappearing. Props boonebgorges. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5325">#5325</a>. (trunk)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunkbpcorebpcoreupdatephp">trunk/bp-core/bp-core-update.php</a></li>
<li><a href="#trunkbploaderphp">trunk/bp-loader.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 (7797 => 7798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2014-02-05 19:35:27 UTC (rev 7797)
+++ trunk/bp-core/bp-core-functions.php 2014-02-05 19:40:14 UTC (rev 7798)
</span><span class="lines">@@ -597,6 +597,12 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_do_register_theme_directory() {
</span><span class="cx"> $register = 'bp-default' === get_stylesheet() || 'bp-default' === get_template();
</span><ins>+
+ // Legacy sites continue to have the theme registered
+ if ( empty( $register ) && ( 1 == get_site_option( '_bp_retain_bp_default' ) ) ) {
+ $register = true;
+ }
+
</ins><span class="cx"> return apply_filters( 'bp_do_register_theme_directory', $register );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorebpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-update.php (7797 => 7798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-update.php 2014-02-05 19:35:27 UTC (rev 7797)
+++ trunk/bp-core/bp-core-update.php 2014-02-05 19:40:14 UTC (rev 7798)
</span><span class="lines">@@ -225,6 +225,11 @@
</span><span class="cx"> if ( $raw_db_version < 7553 ) {
</span><span class="cx"> bp_update_to_1_9();
</span><span class="cx"> }
</span><ins>+
+ // 1.9.2
+ if ( $raw_db_version < 7731 ) {
+ bp_update_to_1_9_2();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** All done! *************************************************************/
</span><span class="lines">@@ -301,6 +306,28 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Perform database updates for BP 1.9.2
+ *
+ * In 1.9, BuddyPress stopped registering its theme directory when it detected
+ * that bp-default (or a child theme) was not currently being used, in effect
+ * deprecating bp-default. However, this ended up causing problems when site
+ * admins using bp-default would switch away from the theme temporarily:
+ * bp-default would no longer be available, with no obvious way (outside of
+ * a manual filter) to restore it. In 1.9.2, we add an option that flags
+ * whether bp-default or a child theme is active at the time of upgrade; if so,
+ * the theme directory will continue to be registered even if the theme is
+ * deactivated temporarily. Thus, new installations will not see bp-default,
+ * but legacy installations using the theme will continue to see it.
+ *
+ * @since BuddyPress (1.9.2)
+ */
+function bp_update_to_1_9_2() {
+ if ( 'bp-default' === get_stylesheet() || 'bp-default' === get_template() ) {
+ update_site_option( '_bp_retain_bp_default', 1 );
+ }
+}
+
+/**
</ins><span class="cx"> * Redirect user to BP's What's New page on first page load after activation.
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.7.0)
</span></span></pre></div>
<a id="trunkbploaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-loader.php (7797 => 7798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-loader.php 2014-02-05 19:35:27 UTC (rev 7797)
+++ trunk/bp-loader.php 2014-02-05 19:40:14 UTC (rev 7798)
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx"> /** Versions **************************************************/
</span><span class="cx">
</span><span class="cx"> $this->version = '2.0-alpha-7752';
</span><del>- $this->db_version = 7553;
</del><ins>+ $this->db_version = 7731;
</ins><span class="cx">
</span><span class="cx"> /** Loading ***************************************************/
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>