summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-03-30 11:11:33 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-03-30 11:11:33 -0400
commit7b02d9d2e14153afd989f7373f3453b9bec3c2a0 (patch)
treec96ab52f879e3ebefa84c9d87a0e5854136c8022 /actions
parent73fbf6580045939bfe9276820476be01d72c0687 (diff)
parenta68836acb4c43500dbff89be1faec19969bc34c2 (diff)
Merge branch 'master' into 0.7.x
Diffstat (limited to 'actions')
-rw-r--r--actions/showgroup.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/actions/showgroup.php b/actions/showgroup.php
index 58cc7a97c..79445851f 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -73,11 +73,17 @@ class ShowgroupAction extends Action
function title()
{
+ if (!empty($this->group->fullname)) {
+ $base = $this->group->fullname . ' (' . $this->group->nickname . ')';
+ } else {
+ $base = $this->group->nickname;
+ }
+
if ($this->page == 1) {
- return sprintf(_("%s group"), $this->group->nickname);
+ return sprintf(_("%s group"), $base);
} else {
return sprintf(_("%s group, page %d"),
- $this->group->nickname,
+ $base,
$this->page);
}
}