Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / p.php

diff --git a/mod/p.php b/mod/p.php
index 6928bb0b997779086f920639e4a0813ef212f60e..4db8f552962c9f8504c4a6ed1ea3c29971c6de42 100644 (file)
--- a/mod/p.php
+++ b/mod/p.php
@@ -31,7 +31,7 @@ function p_init($a){
                        $parts = parse_url($r[0]["author-link"]);
                        $host = $parts["scheme"]."://".$parts["host"];
 
-                       if (normalise_link($host) != normalise_link($a->get_baseurl())) {
+                       if (normalise_link($host) != normalise_link(App::get_baseurl())) {
                                $location = $host."/p/".urlencode($guid).".xml";
 
                                header("HTTP/1.1 301 Moved Permanently");
@@ -48,7 +48,7 @@ function p_init($a){
        $r = q("SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user`
                INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
                WHERE `user`.`uid` = %d", intval($item[0]["uid"]));
-       if (!$r) {
+       if (!dbm::is_result($r)) {
                header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
                killme();
        }