Merge branch 'master' into 0.9.x

2 files changed, 4 insertions, 2 deletions

diff --git a/classes/Notice.php b/classes/Notice.php
index 9f68c5255..fe3f3c017 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1129,7 +1129,7 @@ class Notice extends Memcached_DataObject
         $xs->element('id', null, $this->uri);
 
         $xs->element('published', null, common_date_w3dtf($this->created));
-        $xs->element('updated', null, common_date_w3dtf($this->modified));
+        $xs->element('updated', null, common_date_w3dtf($this->created));
 
         if ($this->reply_to) {
             $reply_notice = Notice::staticGet('id', $this->reply_to);
diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index 0fca5f9cf..602a5bfa8 100644
--- a/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -251,7 +251,9 @@ class UserFlagPlugin extends Plugin
 
     function onEndBlockProfile($user, $profile)
     {
-        if ($this->flagOnBlock) {
+        if ($this->flagOnBlock && !User_flag_profile::exists($profile->id,
+                                                             $user->id)) {
+
             User_flag_profile::create($user->id, $profile->id);
         }
         return true;