update for ES thx Albert

[friendica.git] / mod / p.php

diff --git a/mod/p.php b/mod/p.php
index 8755464519194a5d0cfc89147a960a3f3e2652f9..3ea810614ea4be31680c03d21c3cbb26d4747dab 100644 (file)
--- a/mod/p.php
+++ b/mod/p.php
@@ -2,6 +2,10 @@
 /*
 This file is part of the Diaspora protocol. It is used for fetching single public posts.
 */
+
+use Friendica\App;
+use Friendica\Core\System;
+
 require_once("include/diaspora.php");
 
 function p_init($a){
@@ -31,7 +35,7 @@ function p_init($a){
                        $parts = parse_url($r[0]["author-link"]);
                        $host = $parts["scheme"]."://".$parts["host"];
 
-                       if (normalise_link($host) != normalise_link(App::get_baseurl())) {
+                       if (normalise_link($host) != normalise_link(System::baseUrl())) {
                                $location = $host."/p/".urlencode($guid).".xml";
 
                                header("HTTP/1.1 301 Moved Permanently");
@@ -46,7 +50,7 @@ function p_init($a){
 
        // Fetch some data from the author (We could combine both queries - but I think this is more readable)
        $r = q("SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user`
-               INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
+               INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
                WHERE `user`.`uid` = %d", intval($item[0]["uid"]));
        if (!dbm::is_result($r)) {
                header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));