friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Don't show the alternate url syntax in searches

This commit is contained in:
Michael Vogel 2015-08-25 05:31:21 +02:00
parent 4659a09b53
commit 5c084b754a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/socgraph.php
View File

@ -207,7 +207,7 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
); );
if(count($r)) { if(count($r)) {
$network = $r[0]["network"]; $network = $r[0]["network"];
$profile_url = $r[0]["url"]; //$profile_url = $r[0]["url"];
} }
} }
@ -729,7 +729,7 @@ function poco_check_server($server_url, $network = "", $force = false) {
$last_contact = "0000-00-00 00:00:00"; $last_contact = "0000-00-00 00:00:00";
$last_failure = "0000-00-00 00:00:00"; $last_failure = "0000-00-00 00:00:00";
} }
logger("Server ".$server_url." is unknown. Start discovery.", LOGGER_DEBUG); logger("Server ".$server_url." is outdated or unknown. Start discovery. Force: ".$force." Created: ".$servers[0]["created"]." Failure: ".$last_failure." Contact: ".$last_contact, LOGGER_DEBUG);
$failure = false; $failure = false;
$orig_last_failure = $last_failure; $orig_last_failure = $last_failure;

7
mod/dirfind.php
View File

@ -1,9 +1,9 @@
<?php <?php
require_once('include/contact_widgets.php');
require_once('include/socgraph.php');
function dirfind_init(&$a) { function dirfind_init(&$a) {
require_once('include/contact_widgets.php');
if(! x($a->page,'aside')) if(! x($a->page,'aside'))
$a->page['aside'] = ''; $a->page['aside'] = '';
@ -76,6 +76,9 @@ function dirfind_content(&$a, $prefix = "") {
$j->items_page = $perpage; $j->items_page = $perpage;
$j->page = $a->pager['page']; $j->page = $a->pager['page'];
foreach ($results AS $result) { foreach ($results AS $result) {
if (poco_alternate_ostatus_url($result["url"]))
continue;
if ($result["name"] == "") { if ($result["name"] == "") {
$urlparts = parse_url($result["url"]); $urlparts = parse_url($result["url"]);
$result["name"] = end(explode("/", $urlparts["path"])); $result["name"] = end(explode("/", $urlparts["path"]));