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

diff --git a/classes/Notice.php b/classes/Notice.php
index 9f68c52553d0647ae382685f2ec0ba50c6924ba0..fe3f3c0170365b69ae6168451326e7d842ea53ab 100644 (file)
--- 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/classes/User_location_prefs.php b/classes/User_location_prefs.php
index 52cb254badc46f7d7791a1683eebb71c494a2761..bd6029f97cbc374aa09e6735223283ac310e2159 100644 (file)
--- a/classes/User_location_prefs.php
+++ b/classes/User_location_prefs.php
@@ -45,4 +45,9 @@ class User_location_prefs extends Memcached_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+
+    function sequenceKey()
+    {
+        return array(false, false, false);
+    }
 }

diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index 0fca5f9cf90c22111773e667fe5e1654bb5f63c4..602a5bfa881d20c6739b71269a09fcc6b87f2803 100644 (file)
--- 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;