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

2 files changed, 11 insertions, 2 deletions

diff --git a/classes/Conversation.php b/classes/Conversation.php
index ea8bd87b5..f540004ef 100755
--- a/classes/Conversation.php
+++ b/classes/Conversation.php
@@ -63,7 +63,8 @@ class Conversation extends Memcached_DataObject
         }
 
         $orig = clone($conv);
-        $orig->uri = common_local_url('conversation', array('id' => $id));
+        $orig->uri = common_local_url('conversation', array('id' => $id),
+                                      null, null, false);
         $result = $orig->update($conv);
 
         if (empty($result)) {
diff --git a/classes/Fave.php b/classes/Fave.php
index a04f15e9c..7ca9ade7f 100644
--- a/classes/Fave.php
+++ b/classes/Fave.php
@@ -21,7 +21,15 @@ class Fave extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    static function addNew($profile, $notice) {
+    /**
+     * Save a favorite record.
+     * @fixme post-author notification should be moved here
+     *
+     * @param Profile $profile the local or remote user who likes
+     * @param Notice $notice the notice that is liked
+     * @return mixed false on failure, or Fave record on success
+     */
+    static function addNew(Profile $profile, Notice $notice) {
 
         $fave = null;