<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2031] trunk/bp-themes/bp-sn-parent/_inc: Fixes #1145</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2031</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-10-05 18:03:50 +0000 (Mon, 05 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1145</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpsnparent_incajaxphp">trunk/bp-themes/bp-sn-parent/_inc/ajax.php</a></li>
<li><a href="#trunkbpthemesbpsnparent_incjsajaxjs">trunk/bp-themes/bp-sn-parent/_inc/js/ajax.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpsnparent_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-sn-parent/_inc/ajax.php (2030 => 2031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-sn-parent/_inc/ajax.php 2009-10-03 14:11:09 UTC (rev 2030)
+++ trunk/bp-themes/bp-sn-parent/_inc/ajax.php 2009-10-05 18:03:50 UTC (rev 2031)
</span><span class="lines">@@ -10,29 +10,25 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> function bp_dtheme_ajax_directory_blogs() {
</span><del>- global $bp;
-
</del><span class="cx"> check_ajax_referer('directory_blogs');
</span><span class="cx">
</span><del>- locate_template( array( 'directories/blogs/blogs-loop.php' ), true );
</del><ins>+ locate_template( array( '/directories/blogs/blogs-loop.php' ), true );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'wp_ajax_directory_blogs', 'bp_dtheme_ajax_directory_blogs' );
</span><span class="cx">
</span><span class="cx"> function bp_dtheme_ajax_directory_members() {
</span><span class="cx"> check_ajax_referer('directory_members');
</span><span class="cx">
</span><del>- locate_template( array( 'directories/members/members-loop.php' ), true );
</del><ins>+ locate_template( array( '/directories/members/members-loop.php' ), true );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'wp_ajax_directory_members', 'bp_dtheme_ajax_directory_members' );
</span><span class="cx">
</span><del>-function bp_dtheme_ajax_friends_search() {
- global $bp;
</del><ins>+function bp_dtheme_ajax_directory_groups() {
+ check_ajax_referer('directory_groups');
</ins><span class="cx">
</span><del>- check_ajax_referer( 'friends_search' );
-
- locate_template( array( 'directories/friends/friends-loop.php' ), true );
</del><ins>+ locate_template( array( 'directories/groups/groups-loop.php' ), true );
</ins><span class="cx"> }
</span><del>-add_action( 'wp_ajax_friends_search', 'bp_dtheme_ajax_friends_search' );
</del><ins>+add_action( 'wp_ajax_directory_groups', 'bp_dtheme_ajax_directory_groups' );
</ins><span class="cx">
</span><span class="cx"> function bp_dtheme_ajax_addremove_friend() {
</span><span class="cx"> global $bp;
</span><span class="lines">@@ -63,6 +59,11 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp_ajax_addremove_friend', 'bp_dtheme_ajax_addremove_friend' );
</span><span class="cx">
</span><ins>+function bp_dtheme_ajax_my_friends() {
+ locate_template( array( 'friends/friends-loop.php' ), true );
+}
+add_action( 'wp_ajax_my_friends_search', 'bp_dtheme_ajax_my_friends' );
+
</ins><span class="cx"> function bp_dtheme_ajax_invite_user() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="lines">@@ -202,15 +203,6 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp_ajax_get_group_members_admin', 'bp_dtheme_ajax_member_admin_list' );
</span><span class="cx">
</span><del>-function bp_dtheme_ajax_directory_groups() {
- global $bp;
-
- check_ajax_referer('directory_groups');
-
- locate_template( array( 'directories/groups/groups-loop.php' ), true );
-}
-add_action( 'wp_ajax_directory_groups', 'bp_dtheme_ajax_directory_groups' );
-
</del><span class="cx"> function bp_dtheme_ajax_joinleave_group() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpsnparent_incjsajaxjs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-sn-parent/_inc/js/ajax.js (2030 => 2031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-sn-parent/_inc/js/ajax.js 2009-10-03 14:11:09 UTC (rev 2030)
+++ trunk/bp-themes/bp-sn-parent/_inc/js/ajax.js 2009-10-05 18:03:50 UTC (rev 2031)
</span><span class="lines">@@ -201,18 +201,17 @@
</span><span class="cx"> }
</span><span class="cx"> );
</span><span class="cx">
</span><del>- j("div#pag a").livequery('click',
</del><ins>+ j(".friends div#pag a").livequery('click',
</ins><span class="cx"> function() {
</span><span class="cx"> j('.ajax-loader').toggle();
</span><span class="cx">
</span><span class="cx"> var frpage = j(this).attr('href');
</span><span class="cx"> frpage = frpage.split('=');
</span><del>-
</del><ins>+
</ins><span class="cx"> j.post( ajaxurl, {
</span><del>- action: 'friends_search',
</del><ins>+ action: 'my_friends_search',
</ins><span class="cx"> 'cookie': encodeURIComponent(document.cookie),
</span><span class="cx"> '_wpnonce': j("input#_wpnonce_friend_search").val(),
</span><del>- 'initiator_id': j("input#initiator").val(),
</del><span class="cx"> 'frpage': frpage[1],
</span><span class="cx">
</span><span class="cx"> 'friend-search-box': j("#friend-search-box").val()
</span><span class="lines">@@ -235,22 +234,21 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> j("input#friend-search-box").keyup(
</span><del>-
</del><span class="cx"> function(e) {
</span><span class="cx"> if ( e.which == 13 ) {
</span><span class="cx"> j('.ajax-loader').toggle();
</span><span class="cx">
</span><span class="cx"> j.post( ajaxurl, {
</span><del>- action: 'friends_search',
</del><ins>+ action: 'my_friends_search',
</ins><span class="cx"> 'cookie': encodeURIComponent(document.cookie),
</span><span class="cx"> '_wpnonce': j("input#_wpnonce_friend_search").val(),
</span><del>-
</del><ins>+
</ins><span class="cx"> 'friend-search-box': j("#friend-search-box").val()
</span><span class="cx"> },
</span><span class="cx"> function(response)
</span><del>- {
</del><ins>+ {
</ins><span class="cx"> response = response.substr( 0, response.length - 1 );
</span><del>-
</del><ins>+
</ins><span class="cx"> j("div#friends-loop").fadeOut(200,
</span><span class="cx"> function() {
</span><span class="cx"> j('.ajax-loader').toggle();
</span><span class="lines">@@ -258,9 +256,8 @@
</span><span class="cx"> j("div#friends-loop").fadeIn(200);
</span><span class="cx"> }
</span><span class="cx"> );
</span><del>-
</del><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -405,7 +402,7 @@
</span><span class="cx"> }
</span><span class="cx"> );
</span><span class="cx">
</span><del>- j("form#group-search-form").submit(
</del><ins>+ j("form#group-search-form, form#friend-search-form").submit(
</ins><span class="cx"> function() {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -474,7 +471,7 @@
</span><span class="cx"> }
</span><span class="cx"> );
</span><span class="cx">
</span><del>- j("div#pag a").livequery('click',
</del><ins>+ j(".groups div#pag a").livequery('click',
</ins><span class="cx"> function() {
</span><span class="cx"> j('.ajax-loader').toggle();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>