<!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>[727] sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/bbpress: BuddyPress/bbPress: Add limits to topic split/merge templates to prevent out-of-memory errors when querying for all topics in a given forum.</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://meta.trac.wordpress.org/changeset/727">727</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-06-30 00:36:52 +0000 (Mon, 30 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>BuddyPress/bbPress: Add limits to topic split/merge templates to prevent out-of-memory errors when querying for all topics in a given forum.</pre>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkbuddypressorgpublic_htmlwpcontentthemesbbbasebbpressformtopicmergephp">sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/bbpress/form-topic-merge.php</a></li>
<li><a href="#sitestrunkbuddypressorgpublic_htmlwpcontentthemesbbbasebbpressformtopicsplitphp">sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/bbpress/form-topic-split.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkbuddypressorgpublic_htmlwpcontentthemesbbbasebbpressformtopicmergephp"></a>
<div class="addfile"><h4>Added: sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/bbpress/form-topic-merge.php (0 => 727)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/bbpress/form-topic-merge.php (rev 0)
+++ sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/bbpress/form-topic-merge.php 2014-06-30 00:36:52 UTC (rev 727)
</span><span class="lines">@@ -0,0 +1,114 @@
</span><ins>+<?php
+
+/**
+ * Merge Topic
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+<div id="bbpress-forums">
+
+ <?php bbp_breadcrumb(); ?>
+
+ <?php if ( is_user_logged_in() && current_user_can( 'edit_topic', bbp_get_topic_id() ) ) : ?>
+
+ <div id="merge-topic-<?php bbp_topic_id(); ?>" class="bbp-topic-merge">
+
+ <form id="merge_topic" name="merge_topic" method="post" action="<?php the_permalink(); ?>">
+
+ <fieldset class="bbp-form">
+
+ <legend><?php printf( __( 'Merge topic "%s"', 'bbpress' ), bbp_get_topic_title() ); ?></legend>
+
+ <div>
+
+ <div class="bbp-template-notice info">
+ <p><?php _e( 'Select the topic to merge this one into. The destination topic will remain the lead topic, and this one will change into a reply.', 'bbpress' ); ?></p>
+ <p><?php _e( 'To keep this topic as the lead, go to the other topic and use the merge tool from there instead.', 'bbpress' ); ?></p>
+ </div>
+
+ <div class="bbp-template-notice">
+ <p><?php _e( 'All replies within both the topics will be merged chronologically. The order of the merged replies is based on the time they were posted. If the destination topic was created after this one, its post date will be updated to a second earlier than this one.', 'bbpress' ); ?></p>
+ </div>
+
+ <fieldset class="bbp-form">
+ <legend><?php _e( 'Destination', 'bbpress' ); ?></legend>
+ <div>
+ <?php if ( bbp_has_topics( array( 'show_stickies' => false, 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ), 'post__not_in' => array( bbp_get_topic_id() ) ) ) ) : ?>
+
+ <label for="bbp_destination_topic"><?php _e( 'Merge with this topic:', 'bbpress' ); ?></label>
+
+ <?php
+ bbp_dropdown( array(
+ 'post_type' => bbp_get_topic_post_type(),
+ 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ),
+ 'post_status' => array( bbp_get_public_status_id(), bbp_get_closed_status_id() ),
+ 'selected' => -1,
+ 'numberposts' => 100,
+ 'orderby' => 'date',
+ 'exclude' => bbp_get_topic_id(),
+ 'select_id' => 'bbp_destination_topic'
+ ) );
+ ?>
+
+ <?php else : ?>
+
+ <label><?php _e( 'There are no other topics in this forum to merge with.', 'bbpress' ); ?></label>
+
+ <?php endif; ?>
+
+ </div>
+ </fieldset>
+
+ <fieldset class="bbp-form">
+ <legend><?php _e( 'Topic Extras', 'bbpress' ); ?></legend>
+
+ <div>
+
+ <?php if ( bbp_is_subscriptions_active() ) : ?>
+
+ <input name="bbp_topic_subscribers" id="bbp_topic_subscribers" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
+ <label for="bbp_topic_subscribers"><?php _e( 'Merge topic subscribers', 'bbpress' ); ?></label><br />
+
+ <?php endif; ?>
+
+ <input name="bbp_topic_favoriters" id="bbp_topic_favoriters" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
+ <label for="bbp_topic_favoriters"><?php _e( 'Merge topic favoriters', 'bbpress' ); ?></label><br />
+
+ <?php if ( bbp_allow_topic_tags() ) : ?>
+
+ <input name="bbp_topic_tags" id="bbp_topic_tags" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
+ <label for="bbp_topic_tags"><?php _e( 'Merge topic tags', 'bbpress' ); ?></label><br />
+
+ <?php endif; ?>
+
+ </div>
+ </fieldset>
+
+ <div class="bbp-template-notice error">
+ <p><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'bbpress' ); ?></p>
+ </div>
+
+ <div class="bbp-submit-wrapper">
+ <button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit" class="button submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
+ </div>
+ </div>
+
+ <?php bbp_merge_topic_form_fields(); ?>
+
+ </fieldset>
+ </form>
+ </div>
+
+ <?php else : ?>
+
+ <div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic">
+ <div class="entry-content"><?php is_user_logged_in() ? _e( 'You do not have the permissions to edit this topic!', 'bbpress' ) : _e( 'You cannot edit this topic.', 'bbpress' ); ?></div>
+ </div>
+
+ <?php endif; ?>
+
+</div>
</ins><span class="cx">Property changes on: sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/bbpress/form-topic-merge.php
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="sitestrunkbuddypressorgpublic_htmlwpcontentthemesbbbasebbpressformtopicsplitphp"></a>
<div class="addfile"><h4>Added: sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/bbpress/form-topic-split.php (0 => 727)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/bbpress/form-topic-split.php (rev 0)
+++ sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/bbpress/form-topic-split.php 2014-06-30 00:36:52 UTC (rev 727)
</span><span class="lines">@@ -0,0 +1,118 @@
</span><ins>+<?php
+
+/**
+ * Split Topic
+ *
+ * @package bbPress
+ * @subpackage Theme
+ */
+
+?>
+
+<div id="bbpress-forums">
+
+ <?php bbp_breadcrumb(); ?>
+
+ <?php if ( is_user_logged_in() && current_user_can( 'edit_topic', bbp_get_topic_id() ) ) : ?>
+
+ <div id="split-topic-<?php bbp_topic_id(); ?>" class="bbp-topic-split">
+
+ <form id="split_topic" name="split_topic" method="post" action="<?php the_permalink(); ?>">
+
+ <fieldset class="bbp-form">
+
+ <legend><?php printf( __( 'Split topic "%s"', 'bbpress' ), bbp_get_topic_title() ); ?></legend>
+
+ <div>
+
+ <div class="bbp-template-notice info">
+ <p><?php _e( 'When you split a topic, you are slicing it in half starting with the reply you just selected. Choose to use that reply as a new topic with a new title, or merge those replies into an existing topic.', 'bbpress' ); ?></p>
+ </div>
+
+ <div class="bbp-template-notice">
+ <p><?php _e( 'If you use the existing topic option, replies within both topics will be merged chronologically. The order of the merged replies is based on the time and date they were posted.', 'bbpress' ); ?></p>
+ </div>
+
+ <fieldset class="bbp-form">
+ <legend><?php _e( 'Split Method', 'bbpress' ); ?></legend>
+
+ <div>
+ <input name="bbp_topic_split_option" id="bbp_topic_split_option_reply" type="radio" checked="checked" value="reply" tabindex="<?php bbp_tab_index(); ?>" />
+ <label for="bbp_topic_split_option_reply"><?php printf( __( 'New topic in <strong>%s</strong> titled:', 'bbpress' ), bbp_get_forum_title( bbp_get_topic_forum_id( bbp_get_topic_id() ) ) ); ?></label>
+ <input type="text" id="bbp_topic_split_destination_title" value="<?php printf( __( 'Split: %s', 'bbpress' ), bbp_get_topic_title() ); ?>" tabindex="<?php bbp_tab_index(); ?>" size="35" name="bbp_topic_split_destination_title" />
+ </div>
+
+ <?php if ( bbp_has_topics( array( 'show_stickies' => false, 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ), 'post__not_in' => array( bbp_get_topic_id() ) ) ) ) : ?>
+
+ <div>
+ <input name="bbp_topic_split_option" id="bbp_topic_split_option_existing" type="radio" value="existing" tabindex="<?php bbp_tab_index(); ?>" />
+ <label for="bbp_topic_split_option_existing"><?php _e( 'Use an existing topic in this forum:', 'bbpress' ); ?></label>
+
+ <?php
+ bbp_dropdown( array(
+ 'post_type' => bbp_get_topic_post_type(),
+ 'post_parent' => bbp_get_topic_forum_id( bbp_get_topic_id() ),
+ 'post_status' => array( bbp_get_public_status_id(), bbp_get_closed_status_id() ),
+ 'selected' => -1,
+ 'numberposts' => 100,
+ 'orderby' => 'date',
+ 'exclude' => bbp_get_topic_id(),
+ 'select_id' => 'bbp_destination_topic'
+ ) );
+ ?>
+
+ </div>
+
+ <?php endif; ?>
+
+ </fieldset>
+
+ <fieldset class="bbp-form">
+ <legend><?php _e( 'Topic Extras', 'bbpress' ); ?></legend>
+
+ <div>
+
+ <?php if ( bbp_is_subscriptions_active() ) : ?>
+
+ <input name="bbp_topic_subscribers" id="bbp_topic_subscribers" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
+ <label for="bbp_topic_subscribers"><?php _e( 'Copy subscribers to the new topic', 'bbpress' ); ?></label><br />
+
+ <?php endif; ?>
+
+ <input name="bbp_topic_favoriters" id="bbp_topic_favoriters" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
+ <label for="bbp_topic_favoriters"><?php _e( 'Copy favoriters to the new topic', 'bbpress' ); ?></label><br />
+
+ <?php if ( bbp_allow_topic_tags() ) : ?>
+
+ <input name="bbp_topic_tags" id="bbp_topic_tags" type="checkbox" value="1" checked="checked" tabindex="<?php bbp_tab_index(); ?>" />
+ <label for="bbp_topic_tags"><?php _e( 'Copy topic tags to the new topic', 'bbpress' ); ?></label><br />
+
+ <?php endif; ?>
+
+ </div>
+ </fieldset>
+
+ <div class="bbp-template-notice error">
+ <p><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'bbpress' ); ?></p>
+ </div>
+
+ <div class="bbp-submit-wrapper">
+ <button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit" class="button submit"><?php _e( 'Submit', 'bbpress' ); ?></button>
+ </div>
+ </div>
+
+ <?php bbp_split_topic_form_fields(); ?>
+
+ </fieldset>
+ </form>
+ </div>
+
+ <?php else : ?>
+
+ <div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic">
+ <div class="entry-content"><?php is_user_logged_in() ? _e( 'You do not have the permissions to edit this topic!', 'bbpress' ) : _e( 'You cannot edit this topic.', 'bbpress' ); ?></div>
+ </div>
+
+ <?php endif; ?>
+
+</div>
</ins><span class="cx">Property changes on: sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/bbpress/form-topic-split.php
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span></div>
</body>
</html>