<!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][10654] trunk/src: Support secure cookies.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/10654">10654</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10654","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-03-16 19:39:50 +0000 (Wed, 16 Mar 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Support secure cookies.
If the site is served over HTTPS, mark our cookies as secure.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6961">#6961</a>
Props DJPaul, w3dzign</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoreavatarsphp">trunk/src/bp-core/bp-core-avatars.php</a></li>
<li><a href="#trunksrcbpcorebpcorefunctionsphp">trunk/src/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsactionsphp">trunk/src/bp-groups/bp-groups-actions.php</a></li>
<li><a href="#trunksrcbpmessagesbpmessagesfunctionsphp">trunk/src/bp-messages/bp-messages-functions.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacyjsbuddypressjs">trunk/src/bp-templates/bp-legacy/js/buddypress.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-avatars.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-avatars.php 2016-03-11 14:32:34 UTC (rev 10653)
+++ trunk/src/bp-core/bp-core-avatars.php 2016-03-16 19:39:50 UTC (rev 10654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1038,8 +1038,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove template message.
</span><span class="cx" style="display: block; padding: 0 10px"> $bp->template_message = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $bp->template_message_type = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- @setcookie( 'bp-message', false, time() - 1000, COOKIEPATH );
- @setcookie( 'bp-message-type', false, time() - 1000, COOKIEPATH );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ @setcookie( 'bp-message', false, time() - 1000, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
+ @setcookie( 'bp-message-type', false, time() - 1000, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $avatar ) ) {
</span></span></pre></div>
<a id="trunksrcbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-functions.php 2016-03-11 14:32:34 UTC (rev 10653)
+++ trunk/src/bp-core/bp-core-functions.php 2016-03-16 19:39:50 UTC (rev 10654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1267,8 +1267,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Send the values to the cookie for page reload display.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- @setcookie( 'bp-message', $message, time() + 60 * 60 * 24, COOKIEPATH );
- @setcookie( 'bp-message-type', $type, time() + 60 * 60 * 24, COOKIEPATH );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ @setcookie( 'bp-message', $message, time() + 60 * 60 * 24, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
+ @setcookie( 'bp-message-type', $type, time() + 60 * 60 * 24, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get BuddyPress.
</span><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1311,11 +1311,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'template_notices', 'bp_core_render_message' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_COOKIE['bp-message'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- @setcookie( 'bp-message', false, time() - 1000, COOKIEPATH );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ @setcookie( 'bp-message', false, time() - 1000, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_COOKIE['bp-message-type'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- @setcookie( 'bp-message-type', false, time() - 1000, COOKIEPATH );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ @setcookie( 'bp-message-type', false, time() - 1000, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_actions', 'bp_core_setup_message', 5 );
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-actions.php 2016-03-11 14:32:34 UTC (rev 10653)
+++ trunk/src/bp-groups/bp-groups-actions.php 2016-03-16 19:39:50 UTC (rev 10654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,8 +122,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $bp->groups->current_create_step );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $bp->groups->completed_create_steps );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setcookie( 'bp_new_group_id', false, time() - 1000, COOKIEPATH );
- setcookie( 'bp_completed_create_steps', false, time() - 1000, COOKIEPATH );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setcookie( 'bp_new_group_id', false, time() - 1000, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
+ setcookie( 'bp_completed_create_steps', false, time() - 1000, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $reset_steps = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $keys = array_keys( $bp->groups->group_creation_steps );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,8 +252,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $bp->groups->completed_create_steps[] = bp_get_groups_current_create_step();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Reset cookie info.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setcookie( 'bp_new_group_id', $bp->groups->new_group_id, time()+60*60*24, COOKIEPATH );
- setcookie( 'bp_completed_create_steps', base64_encode( json_encode( $bp->groups->completed_create_steps ) ), time()+60*60*24, COOKIEPATH );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setcookie( 'bp_new_group_id', $bp->groups->new_group_id, time()+60*60*24, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
+ setcookie( 'bp_completed_create_steps', base64_encode( json_encode( $bp->groups->completed_create_steps ) ), time()+60*60*24, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If we have completed all steps and hit done on the final step we
</span><span class="cx" style="display: block; padding: 0 10px"> // can redirect to the completed group.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,8 +262,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $bp->groups->current_create_step );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $bp->groups->completed_create_steps );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setcookie( 'bp_new_group_id', false, time() - 3600, COOKIEPATH );
- setcookie( 'bp_completed_create_steps', false, time() - 3600, COOKIEPATH );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setcookie( 'bp_new_group_id', false, time() - 3600, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
+ setcookie( 'bp_completed_create_steps', false, time() - 3600, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Once we completed all steps, record the group creation in the activity stream.
</span><span class="cx" style="display: block; padding: 0 10px"> groups_record_activity( array(
</span></span></pre></div>
<a id="trunksrcbpmessagesbpmessagesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-messages/bp-messages-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-messages/bp-messages-functions.php 2016-03-11 14:32:34 UTC (rev 10653)
+++ trunk/src/bp-messages/bp-messages-functions.php 2016-03-16 19:39:50 UTC (rev 10654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,9 +335,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $content Content of the message.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function messages_add_callback_values( $recipients, $subject, $content ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- @setcookie( 'bp_messages_send_to', $recipients, time() + 60 * 60 * 24, COOKIEPATH );
- @setcookie( 'bp_messages_subject', $subject, time() + 60 * 60 * 24, COOKIEPATH );
- @setcookie( 'bp_messages_content', $content, time() + 60 * 60 * 24, COOKIEPATH );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ @setcookie( 'bp_messages_send_to', $recipients, time() + 60 * 60 * 24, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
+ @setcookie( 'bp_messages_subject', $subject, time() + 60 * 60 * 24, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
+ @setcookie( 'bp_messages_content', $content, time() + 60 * 60 * 24, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,9 +346,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see messages_add_callback_values()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function messages_remove_callback_values() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- @setcookie( 'bp_messages_send_to', false, time() - 1000, COOKIEPATH );
- @setcookie( 'bp_messages_subject', false, time() - 1000, COOKIEPATH );
- @setcookie( 'bp_messages_content', false, time() - 1000, COOKIEPATH );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ @setcookie( 'bp_messages_send_to', false, time() - 1000, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
+ @setcookie( 'bp_messages_subject', false, time() - 1000, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
+ @setcookie( 'bp_messages_content', false, time() - 1000, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacyjsbuddypressjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/js/buddypress.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/js/buddypress.js 2016-03-11 14:32:34 UTC (rev 10653)
+++ trunk/src/bp-templates/bp-legacy/js/buddypress.js 2016-03-16 19:39:50 UTC (rev 10654)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,7 +265,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Reset the page */
</span><span class="cx" style="display: block; padding: 0 10px"> jq.cookie( 'bp-activity-oldestpage', 1, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/',
+ secure: ( 'https:' === window.location.protocol )
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Activity Stream Tabs */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -438,7 +439,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null === jq.cookie('bp-activity-oldestpage') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> jq.cookie('bp-activity-oldestpage', 1, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/',
+ secure: ( 'https:' === window.location.protocol )
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -467,7 +469,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> jq('#buddypress li.load-more').removeClass('loading');
</span><span class="cx" style="display: block; padding: 0 10px"> jq.cookie( 'bp-activity-oldestpage', oldest_page, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/',
+ secure: ( 'https:' === window.location.protocol )
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> jq('#buddypress ul.activity-list').append(response.contents);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1756,25 +1759,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* Clear BP cookies on logout */
</span><span class="cx" style="display: block; padding: 0 10px"> jq('#wp-admin-bar-logout, a.logout').on( 'click', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> jq.removeCookie('bp-activity-scope', {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/',
+ secure: ( 'https:' === window.location.protocol )
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> jq.removeCookie('bp-activity-filter', {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/',
+ secure: ( 'https:' === window.location.protocol )
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> jq.removeCookie('bp-activity-oldestpage', {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/',
+ secure: ( 'https:' === window.location.protocol )
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var objects = [ 'members', 'groups', 'blogs', 'forums' ];
</span><span class="cx" style="display: block; padding: 0 10px"> jq(objects).each( function(i) {
</span><span class="cx" style="display: block; padding: 0 10px"> jq.removeCookie('bp-' + objects[i] + '-scope', {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/',
+ secure: ( 'https:' === window.location.protocol )
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> jq.removeCookie('bp-' + objects[i] + '-filter', {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/',
+ secure: ( 'https:' === window.location.protocol )
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> jq.removeCookie('bp-' + objects[i] + '-extras', {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/',
+ secure: ( 'https:' === window.location.protocol )
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1850,7 +1859,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_init_activity() {
</span><span class="cx" style="display: block; padding: 0 10px"> /* Reset the page */
</span><span class="cx" style="display: block; padding: 0 10px"> jq.cookie( 'bp-activity-oldestpage', 1, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/',
+ secure: ( 'https:' === window.location.protocol )
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( undefined !== jq.cookie('bp-activity-filter') && jq('#activity-filter-select').length ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1894,13 +1904,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Save the settings we want to remain persistent to a cookie */
</span><span class="cx" style="display: block; padding: 0 10px"> jq.cookie( 'bp-' + object + '-scope', scope, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/',
+ secure: ( 'https:' === window.location.protocol )
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> jq.cookie( 'bp-' + object + '-filter', filter, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/',
+ secure: ( 'https:' === window.location.protocol )
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> jq.cookie( 'bp-' + object + '-extras', extras, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/',
+ secure: ( 'https:' === window.location.protocol )
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Set the correct selected nav and filter */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1958,16 +1971,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* Save the type and filter to a session cookie */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null !== scope ) {
</span><span class="cx" style="display: block; padding: 0 10px"> jq.cookie( 'bp-activity-scope', scope, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/',
+ secure: ( 'https:' === window.location.protocol )
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null !== filter ) {
</span><span class="cx" style="display: block; padding: 0 10px"> jq.cookie( 'bp-activity-filter', filter, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/',
+ secure: ( 'https:' === window.location.protocol )
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> jq.cookie( 'bp-activity-oldestpage', 1, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- path: '/'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ path: '/',
+ secure: ( 'https:' === window.location.protocol )
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Remove selected and loading classes from tabs */
</span></span></pre>
</div>
</div>
</body>
</html>