Merge branch 'master' of gitorious.org:statusnet/mainline into testing

diff --combined classes/Notice.php
index cda6328853affe577fec764d6cd87f929a6623d5,0838ca2a2cb8150e7fafe9a2c95558db6675d62a..9ac9e10c109198e88e842561301e67913992454d
--- 1/classes/Notice.php
--- 2/classes/Notice.php
+++ b/classes/Notice.php
@@@ -1252,6 -1252,8 +1252,8 @@@ class Notice extends Memcached_DataObje
  
          if (!empty($cur)) {
              $noticeInfoAttr['favorite'] = ($cur->hasFave($this)) ? "true" : "false";
+           $profile = $cur->getProfile();
+           $noticeInfoAttr['repeated'] = ($profile->hasRepeated($this->id)) ? "true" : "false";
          }
  
          if (!empty($this->repeat_of)) {
@@@ -1861,16 -1863,4 +1863,16 @@@
          return $ns;
      }
  
 +    /**
 +     * Determine whether the notice was locally created
 +     *
 +     * @return boolean locality
 +     */
 +
 +    public function isLocal()
 +    {
 +        return ($this->is_local == Notice::LOCAL_PUBLIC ||
 +                $this->is_local == Notice::LOCAL_NONPUBLIC);
 +    }
 +
  }