Merge branch 'pull'

5 files changed, 8 insertions, 9 deletions

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index abacd9906..5a24f0089 100755..100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -252,7 +252,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			$message = unxmlify($xml->message);   // human readable text of what may have gone wrong.
 			switch($status) {
 				case 0:
-					notice( t("Confirmation completed successfully.") . EOL);
+					info( t("Confirmation completed successfully.") . EOL);
 					if(strlen($message))
 						notice( t('Remote site reported: ') . $message . EOL);
 					break;
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index ceec83e90..bc159137d 100755
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -677,7 +677,7 @@ function dfrn_request_content(&$a) {
 			'$no' => t('No'),
 			'$add_note' => t('Add a personal note:'),
 			'$page_desc' => $page_desc,
-			'$friendika' => t('Friendica'),
+			'$friendica' => t('Friendica'),
 			'$statusnet' => t('StatusNet/Federated Social Web'),
 			'$diaspora' => t('Diaspora'),
 			'$diasnote' => t('- please share from your own site as noted above'),
diff --git a/mod/dirfind.php b/mod/dirfind.php
index 801018276..75b1c4976 100755
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -27,7 +27,7 @@ function dirfind_content(&$a) {
 		$p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
 			
 		if(strlen(get_config('system','directory_submit_url')))
-			$x = fetch_url('http://dir.friendika.com/lsearch?f=' . $p .  '&search=' . urlencode($search));
+			$x = fetch_url('http://dir.friendica.com/lsearch?f=' . $p .  '&search=' . urlencode($search));
 
 //TODO fallback local search if global dir not available.
 //		else
diff --git a/mod/match.php b/mod/match.php
index 3645a419d..1ae7848a6 100755
--- a/mod/match.php
+++ b/mod/match.php
@@ -31,7 +31,7 @@ function match_content(&$a) {
 			$params['p'] = $a->pager['page'];
 			
 		if(strlen(get_config('system','directory_submit_url')))
-			$x = post_url('http://dir.friendika.com/msearch', $params);
+			$x = post_url('http://dir.friendica.com/msearch', $params);
 		else
 			$x = post_url($a->get_baseurl() . '/msearch', $params);
 
diff --git a/mod/ping.php b/mod/ping.php
index db68332bd..9c2e385d6 100755..100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -5,6 +5,7 @@ require_once("include/datetime.php");
 function ping_init(&$a) {
 
 	header("Content-type: text/xml");
+	
 	echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
 		<result>";
 
@@ -90,22 +91,20 @@ function ping_init(&$a) {
 		}
 
 
-		$intros1 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`, 
+		$intros1 = q("SELECT  `intro`.`id`, `intro`.`datetime`, 
 			`fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo` 
 			FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
 			WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid`!=0",
 			intval(local_user())
 		);
-		$intros2 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`, 
+		$intros2 = q("SELECT `intro`.`id`, `intro`.`datetime`, 
 			`contact`.`name`, `contact`.`url`, `contact`.`photo` 
 			FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
 			WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id`!=0",
 			intval(local_user())
 		);
 		
-		$intro = $intros1[0]['total'] + $intros2[0]['total'];
-		if ($intros1[0]['total']==0) $intros1=Array();
-		if ($intros2[0]['total']==0) $intros2=Array();
+		$intro = count($intros1) + count($intros2);
 		$intros = $intros1+$intros2;