Browse Source

fix typo, check for empty group in network page

pull/1/head
Friendika 11 years ago
parent
commit
0cba6b128a
4 changed files with 13 additions and 8 deletions
  1. +1
    -1
      mod/contacts.php
  2. +1
    -1
      mod/display.php
  3. +10
    -5
      mod/network.php
  4. +1
    -1
      mod/profile.php

+ 1
- 1
mod/contacts.php View File

@ -166,7 +166,7 @@ function contacts_content(&$a) {
'$content' => t('stopped following'),
'$nick' => $a->user['nickname'],
'$verb' => ACTIVITY_UNFOLLOW,
'$ostat_follow' => '<as:verb>http://ostatus.org/schema/1.0/unfollow</as:verb>' . "\r\n";
'$ostat_follow' => '<as:verb>http://ostatus.org/schema/1.0/unfollow</as:verb>' . "\r\n"
));
if((x($orig_record[0],'notify')) && (strlen($orig_record[0]['notify']))) {


+ 1
- 1
mod/display.php View File

@ -243,7 +243,7 @@ function display_content(&$a) {
$tmp_item = replace_macros($template,array(
'$id' => $item['item_id'],
'$title' => t('View $name's profile'),
'$title' => t('View $name\'s profile'),
'$profile_url' => $profile_link,
'$name' => $profile_name,
'$sparkle' => $sparkle,


+ 10
- 5
mod/network.php View File

@ -104,10 +104,15 @@ function network_content(&$a, $update = 0) {
}
$contacts = expand_groups(array($group));
$contact_str = implode(',',$contacts);
$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `contact-id` IN ( $contact_str )) ";
$o = '<h4>' . t('Group: ') . $r[0]['name'] . '</h4>' . $o;
if((is_array($contacts)) && count($contacts)) {
$contact_str = implode(',',$contacts);
}
else {
$contact_str = ' 0 ';
notice( t('Group is empty'));
}
$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `contact-id` IN ( $contact_str )) ";
$o = '<h4>' . t('Group: ') . $r[0]['name'] . '</h4>' . $o;
}
$r = q("SELECT COUNT(*) AS `total`
@ -286,7 +291,7 @@ function network_content(&$a, $update = 0) {
$tmp_item = replace_macros($template,array(
'$id' => $item['item_id'],
'$title' => t('View $name's profile'),
'$title' => t('View $name\'s profile'),
'$profile_url' => $profile_link,
'$name' => $profile_name,
'$thumb' => $profile_avatar,


+ 1
- 1
mod/profile.php View File

@ -344,7 +344,7 @@ function profile_content(&$a, $update = 0) {
$tmp_item = replace_macros($template,array(
'$id' => $item['item_id'],
'$title' => t('View $name's profile'),
'$title' => t('View $name\'s profile'),
'$profile_url' => $profile_link,
'$name' => $profile_name,
'$thumb' => $profile_avatar,


Loading…
Cancel
Save