add group highlight to other pages

diff --git a/include/group.php b/include/group.php
index fd3439b8524fc17b36c635d39c92cfc83bcb8a28..30a023d4199987f1a7f927d008113765508f9a2d 100644 (file)
--- a/include/group.php
+++ b/include/group.php
@@ -145,7 +145,7 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
 
        $createtext = t('Create a new group');
        $linktext= t('Everybody');
-       $selected = (($group_id == 0 && $every !== 'contacts') ? ' class="group-selected" ' : '');
+       $selected = (($group_id == 0) ? ' class="group-selected" ' : '');
 $o .= <<< EOT
 
 <div id="group-sidebar">
@@ -166,7 +166,7 @@ EOT;
        );
        if(count($r)) {
                foreach($r as $rr)
-                       $selected = (($group_id == $rr['id'] && $every !== 'contacts') ? ' class="group-selected" ' : '');
+                       $selected = (($group_id == $rr['id']) ? ' class="group-selected" ' : '');
                        $o .= ' <li class="sidebar-group-li">' . (($edit) ? "<a href=\"group/{$rr['id']}\" title=\"" . t('Edit') . "\" ><img src=\"images/spencil.gif\" alt=\"" . t('Edit') . "\"></a> " : "") . "<a href=\"$each/{$rr['id']}\" $selected >{$rr['name']}</a></li>\r\n";
        }
        $o .= " </ul>\r\n       </div>\r\n</div>";      

diff --git a/mod/group.php b/mod/group.php
index fd54b0effdb61e212dffd0a87d003d9fdcdb4c27..981796f67efe6a0674dbd5fd21d3b61d45b53ea7 100644 (file)
--- a/mod/group.php
+++ b/mod/group.php
@@ -7,7 +7,7 @@ function validate_members(&$item) {
 function group_init(&$a) {
        if(local_user()) {
                require_once('include/group.php');
-               $a->page['aside'] = group_side();
+               $a->page['aside'] = group_side('contacts','group',false,(($a->argc > 1) ? intval($a->argv[1]) : 0));
        }
 }