diff options
| author | Friendika <info@friendika.com> | 2011-01-03 13:53:26 -0800 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-01-03 13:53:26 -0800 |
| commit | 0cba6b128ad98e7e32aab89462dc635c638c968a (patch) | |
| tree | e727b5fd0854f822ce03cf73c773aac1d7f7a192 | |
| parent | a51a1007a38e763adcae5ea3865745b2ae80f921 (diff) | |
| download | volse-hubzilla-0cba6b128ad98e7e32aab89462dc635c638c968a.tar.gz volse-hubzilla-0cba6b128ad98e7e32aab89462dc635c638c968a.tar.bz2 volse-hubzilla-0cba6b128ad98e7e32aab89462dc635c638c968a.zip | |
fix typo, check for empty group in network page
| -rw-r--r-- | mod/contacts.php | 2 | ||||
| -rw-r--r-- | mod/display.php | 2 | ||||
| -rw-r--r-- | mod/network.php | 15 | ||||
| -rw-r--r-- | mod/profile.php | 2 |
4 files changed, 13 insertions, 8 deletions
diff --git a/mod/contacts.php b/mod/contacts.php index 320c0f420..92bce0a73 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -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']))) { diff --git a/mod/display.php b/mod/display.php index 30b55dece..cad60d275 100644 --- a/mod/display.php +++ b/mod/display.php @@ -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, diff --git a/mod/network.php b/mod/network.php index e1bec8dfa..08607fa18 100644 --- a/mod/network.php +++ b/mod/network.php @@ -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, diff --git a/mod/profile.php b/mod/profile.php index 7a57bd5a4..5479f2806 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -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, |