Merge branch '0.9-release' of git@gitorious.org:statusnet/mainline into 0.9-release
This commit is contained in:
commit
c213477081
@ -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');
|
||||
|
||||
|
@ -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')) {
|
||||
|
Loading…
Reference in New Issue
Block a user