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

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

This commit is contained in:
Evan Prodromou 2011-04-08 17:09:15 -04:00
parent af02de01e5 8335d234f7
commit 8cb0d7e708
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/SearchSub/SearchSubPlugin.php
View File

@ -324,11 +324,13 @@ class SearchSubPlugin extends Plugin
{
$user = common_current_user();
$searches = SearchSub::forProfile($user->getProfile());
if (!empty($user)) {
$searches = SearchSub::forProfile($user->getProfile());
if (!empty($searches) && count($searches) > 0) {
$searchSubMenu = new SearchSubMenu($menu->out, $user, $searches);
$menu->submenu(_m('Searches'), $searchSubMenu);
if (!empty($searches) && count($searches) > 0) {
$searchSubMenu = new SearchSubMenu($menu->out, $user, $searches);
$menu->submenu(_m('Searches'), $searchSubMenu);
}
}
return true;

11
plugins/TagSub/TagSubPlugin.php
View File

@ -245,11 +245,14 @@ class TagSubPlugin extends Plugin
{
$user = common_current_user();
$tags = TagSub::forProfile($user->getProfile());
if (!empty($user)) {
if (!empty($tags) && count($tags) > 0) {
$tagSubMenu = new TagSubMenu($menu->out, $user, $tags);
$menu->submenu(_m('Tags'), $tagSubMenu);
$tags = TagSub::forProfile($user->getProfile());
if (!empty($tags) && count($tags) > 0) {
$tagSubMenu = new TagSubMenu($menu->out, $user, $tags);
$menu->submenu(_m('Tags'), $tagSubMenu);
}
}
return true;