Merge pull request #4328 from tobiasd/20180125-msg

[friendica.git] / mod / starred.php

diff --git a/mod/starred.php b/mod/starred.php
index 0a78f51aa7ecd00d7b701f1ee4021a22ac0e5655..5cd9c0fe18768a2a9b9a701e0bf180c6ec1d0652 100644 (file)
--- a/mod/starred.php
+++ b/mod/starred.php
@@ -1,7 +1,10 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
 
-function starred_init(App &$a) {
+function starred_init(App $a) {
 
        require_once("include/threads.php");
 
@@ -17,18 +20,19 @@ function starred_init(App &$a) {
                killme();
        }
 
-       $r = q("SELECT starred FROM item WHERE uid = %d AND id = %d LIMIT 1",
+       $r = q("SELECT `starred` FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1",
                intval(local_user()),
                intval($message_id)
        );
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                killme();
        }
 
-       if(! intval($r[0]['starred']))
+       if (! intval($r[0]['starred'])) {
                $starred = 1;
+       }
 
-       $r = q("UPDATE item SET starred = %d WHERE uid = %d and id = %d",
+       $r = q("UPDATE `item` SET `starred` = %d WHERE `uid` = %d AND `id` = %d",
                intval($starred),
                intval(local_user()),
                intval($message_id)
@@ -38,12 +42,15 @@ function starred_init(App &$a) {
 
        // See if we've been passed a return path to redirect to
        $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
-       if($return_path) {
+       if ($return_path) {
                $rand = '_=' . time();
-               if(strpos($return_path, '?')) $rand = "&$rand";
-               else $rand = "?$rand";
+               if (strpos($return_path, '?')) {
+                       $rand = "&$rand";
+               } else {
+                       $rand = "?$rand";
+               }
 
-               goaway(App::get_baseurl() . "/" . $return_path . $rand);
+               goaway(System::baseUrl() . "/" . $return_path . $rand);
        }
 
        // the json doesn't really matter, it will either be 0 or 1