Merge branch 'develop' into rewrites/coding-convention-split2-1-2

[friendica.git] / mod / notice.php

diff --git a/mod/notice.php b/mod/notice.php
index a42d60dd401f344e4d564229711366c6452ce0e3..b7029397b5f145c55970dbbb9ff4803b64d35b78 100644 (file)
--- a/mod/notice.php
+++ b/mod/notice.php
@@ -1,15 +1,14 @@
 <?php
-/* identi.ca -> friendica items permanent-url compatibility */
+       /* identi.ca -> friendica items permanent-url compatibility */
 
-if(! function_exists('notice_init')) {
-       function notice_init(&$a) {
+       function notice_init(App $a) {
                $id = $a->argv[1];
                $r = q("SELECT user.nickname FROM user LEFT JOIN item ON item.uid=user.uid WHERE item.id=%d",
                                intval($id)
                                );
-               if (count($r)){
+               if (dbm::is_result($r)){
                        $nick = $r[0]['nickname'];
-                       $url = $a->get_baseurl()."/display/$nick/$id";
+                       $url = App::get_baseurl()."/display/$nick/$id";
                        goaway($url);
                } else {
                        $a->error = 404;
@@ -17,5 +16,5 @@ if(! function_exists('notice_init')) {
 
                }
                return;
+
        }
-}