Merge remote-tracking branch 'friendica/develop' into develop

[friendica.git] / mod / starred.php

diff --git a/mod/starred.php b/mod/starred.php
index 035b81e764c26494cdab26239e1fa1897e078ec0..27f924e44b5452abad9c95ca3ec655019f83b23e 100644 (file)
--- a/mod/starred.php
+++ b/mod/starred.php
@@ -3,6 +3,8 @@
 
 function starred_init(&$a) {
 
+       require_once("include/threads.php");
+
        $starred = 0;
 
        if(! local_user())
@@ -16,18 +18,30 @@ function starred_init(&$a) {
                intval(local_user()),
                intval($message_id)
        );
-       if(! count($r))
+       if(! dbm::is_result($r))
                killme();
 
        if(! intval($r[0]['starred']))
                $starred = 1;
 
-       $r = q("UPDATE item SET starred = %d WHERE uid = %d and id = %d LIMIT 1",
+       $r = q("UPDATE item SET starred = %d WHERE uid = %d and id = %d",
                intval($starred),
                intval(local_user()),
                intval($message_id)
        );
- 
+
+       update_thread($message_id);
+
+       // See if we've been passed a return path to redirect to
+       $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
+       if($return_path) {
+               $rand = '_=' . time();
+               if(strpos($return_path, '?')) $rand = "&$rand";
+               else $rand = "?$rand";
+
+               goaway($a->get_baseurl() . "/" . $return_path . $rand);
+       }
+
        // the json doesn't really matter, it will either be 0 or 1
 
        echo json_encode($starred);