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

Merge branch '0.9-release' of git@gitorious.org:statusnet/mainline into 0.9-release

This commit is contained in:
Sarven Capadisli 2009-11-20 04:03:58 +00:00
parent b40948a700 50827d5e81
commit c213477081
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/UserFlag/UserFlagPlugin.php
View File

@ -88,7 +88,7 @@ class UserFlagPlugin extends Plugin
{
$user = common_current_user();
if (!empty($user)) {
if (!empty($user) && ($user->id != $profile->id)) {
$action->elementStart('li', 'entity_flag');

8
plugins/UserFlag/flagprofile.php
View File

@ -86,12 +86,6 @@ class FlagprofileAction extends ProfileFormAction
function handle($args)
{
if ($this->boolean('ajax')) {
common_debug("ajax called for");
} else {
common_debug("no ajax");
}
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->handlePost();
if (!$this->boolean('ajax')) {
@ -125,7 +119,7 @@ class FlagprofileAction extends ProfileFormAction
}
$ufp->free();
if ($this->boolean('ajax')) {
$this->ajaxResults();
}