GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

a little more protection against empty tags

Browse Source
This commit is contained in:
Evan Prodromou
2011-04-05 18:36:49 -04:00
parent f2a9c9c26d
commit 11bbc5adcd
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/TagSub/TagSub.php
View File

@@ -147,7 +147,7 @@ class TagSub extends Managed_DataObject
$keypart = sprintf('tagsub:by_profile:%d', $profile->id);
$tagstring = self::cacheGet($keypart);
if ($tagstring !== false) {
if ($tagstring !== false && !empty($tagstring)) {
$tags = explode(',', $tagstring);
} else {
$tagsub = new TagSub();
@@ -155,7 +155,9 @@ class TagSub extends Managed_DataObject
if ($tagsub->find()) {
while ($tagsub->fetch()) {
$tags[] = $tagsub->tag;
if (!empty($tagsub->tag)) {
$tags[] = $tagsub->tag;
}
}
}

2
plugins/TagSub/tagsubmenu.php
View File

@@ -62,12 +62,14 @@ class TagSubMenu extends Menu
$this->out->elementStart('ul', array('class' => 'nav'));
foreach ($this->tags as $tag) {
if (!empty($tag)) {
$this->out->menuItem(common_local_url('tag',
array('tag' => $tag)),
sprintf('#%s', $tag),
sprintf(_('Notices tagged with %s'), $tag),
$this->actionName == 'tag' && $this->action->arg('tag') == $tag,
'nav_streams_tag_'.$tag);
}
}
$this->out->elementEnd('ul');