Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 28 insertions, 7 deletions

diff --git a/mod/viewconnections.php b/mod/viewconnections.php
index e35d5ca21..c1da07292 100644
--- a/mod/viewconnections.php
+++ b/mod/viewconnections.php
@@ -28,6 +28,10 @@ function viewconnections_content(&$a) {
 		return;
 	} 
 
+	if(! $_REQUEST['aj'])
+		$_SESSION['return_url'] = $a->query_string;
+
+
 	$is_owner = ((local_channel() && local_channel() == $a->profile['uid']) ? true : false);
 
 	$abook_flags = ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF;
@@ -53,7 +57,7 @@ function viewconnections_content(&$a) {
 		intval($a->pager['start'])
 	);
 
-	if(! $r) {
+	if((! $r) && (! $_REQUEST['aj'])) {
 		info( t('No connections.') . EOL );
 		return $o;
 	}
@@ -80,13 +84,30 @@ function viewconnections_content(&$a) {
 	}
 
 
-	$tpl = get_markup_template("viewcontact_template.tpl");
-	$o .= replace_macros($tpl, array(
-		'$title' => t('View Connections'),
-		'$contacts' => $contacts,
-		'$paginate' => paginate($a),
-	));
+	if($_REQUEST['aj']) {
+		if($contacts) {
+			$o = replace_macros(get_markup_template('viewcontactsajax.tpl'),array(
+				'$contacts' => $contacts
+			));
+		}
+		else {
+			$o = '<div id="content-complete"></div>';
+		}
+		echo $o;
+		killme();
+	}
+	else {
+		$o .= "<script> var page_query = '" . $_GET['q'] . "'; var extra_args = '" . extra_query_args() . "' ; </script>";
+		$tpl = get_markup_template("viewcontact_template.tpl");
+		$o .= replace_macros($tpl, array(
+			'$title' => t('View Connections'),
+			'$contacts' => $contacts,
+//			'$paginate' => paginate($a),
+		));
+	}
 
+    if(! $contacts)
+        $o .= '<div id="content-complete"></div>';
 
 	return $o;
 }