Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
This commit is contained in:
commit
8cb0d7e708
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user