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

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();
         }