Merge pull request #247 from simonlnu/master

[friendica.git] / include / group.php

diff --git a/include/group.php b/include/group.php
index cae76eb6d2c6fdfbcb6f556f49dc4c3c11a6b5ba..edb547de6d8f00ea31561efebf63c7a3b84dbf4c 100644 (file)
--- a/include/group.php
+++ b/include/group.php
@@ -109,7 +109,7 @@ function group_add_member($uid,$name,$member) {
        );
        if(count($r))
                return true;    // You might question this, but 
-                               // we indicate success because the group was in fact created
+                               // we indicate success because the group member was in fact created
                                // -- It was just created at another time
        if(! count($r))
                $r = q("INSERT INTO `group_member` (`uid`, `gid`, `contact-id`)
@@ -166,6 +166,7 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
        
        $groups[] = array(
                'text'  => t('Everybody'),
+               'id' => 0,
                'selected' => (($group_id == 0) ? 'group-selected' : ''),
                'href'  => $every,
        );
@@ -209,7 +210,9 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
        $tpl = get_markup_template("group_side.tpl");
        $o = replace_macros($tpl, array(
                '$title'                => t('Groups'),
+               '$edittext'     => t('Edit group'),
                '$createtext'   => t('Create a new group'),
+               '$ungrouped'    => (($every === 'contacts') ? t('Contacts not in any group') : ''),
                '$groups'               => $groups,
                '$add'                  => t('add'),
        ));