summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2009-11-20 04:03:58 +0000
committerSarven Capadisli <csarven@status.net>2009-11-20 04:03:58 +0000
commitc213477081afefb1720c8ae729d1965e7a1dac63 (patch)
tree4eb5cf3497ae37d9c48da4c1a63785c4bd06bdeb
parentb40948a700fa82110c28a3c8a48dc289e72163bd (diff)
parent50827d5e81c1b6a5c99e0d0fba2d6ed4c0d22875 (diff)
Merge branch '0.9-release' of git@gitorious.org:statusnet/mainline into 0.9-release
-rw-r--r--plugins/UserFlag/UserFlagPlugin.php2
-rw-r--r--plugins/UserFlag/flagprofile.php8
2 files changed, 2 insertions, 8 deletions
diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index c276c4b9f..97b999a2f 100644
--- a/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -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');
diff --git a/plugins/UserFlag/flagprofile.php b/plugins/UserFlag/flagprofile.php
index b01d07e34..9bce7865b 100644
--- a/plugins/UserFlag/flagprofile.php
+++ b/plugins/UserFlag/flagprofile.php
@@ -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();
}