harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set a default directory server from a hard-wired list if one was not previously chosen.

Browse Source
This commit is contained in:
friendica
2014-04-25 18:10:23 -07:00
parent d6620522c2
commit 3e8e67df2c
8 changed files with 39 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mod/acl.php
View File

@@ -304,13 +304,7 @@ function navbar_complete(&$a) {
if(! $url) {
require_once("include/dir_fns.php");
$directory = find_upstream_directory($dirmode);
if($directory) {
$url = $directory['url'] . '/dirsearch';
}
else {
$url = DIRECTORY_FALLBACK_MASTER . '/dirsearch';
}
$url = $directory['url'] . '/dirsearch';
}
if($url) {

9
mod/directory.php
View File

@@ -56,14 +56,9 @@ function directory_content(&$a) {
}
if(! $url) {
$directory = find_upstream_directory($dirmode);
if($directory) {
$url = $directory['url'] . '/dirsearch';
}
else {
$url = DIRECTORY_FALLBACK_MASTER . '/dirsearch';
}
$url = $directory['url'] . '/dirsearch';
}
logger('mod_directory: URL = ' . $url, LOGGER_DEBUG);
$contacts = array();

8
mod/dirprofile.php
View File

@@ -23,13 +23,7 @@ function dirprofile_init(&$a) {
}
if(! $url) {
$directory = find_upstream_directory($dirmode);
if($directory) {
$url = $directory['url'] . '/dirsearch';
}
else {
$url = DIRECTORY_FALLBACK_MASTER . '/dirsearch';
}
$url = $directory['url'] . '/dirsearch';
}
logger('mod_directory: URL = ' . $url, LOGGER_DEBUG);

8
mod/pubsites.php
View File

@@ -9,13 +9,7 @@ function pubsites_content(&$a) {
}
if(! $url) {
$directory = find_upstream_directory($dirmode);
if($directory) {
$url = $directory['url'] . '/dirsearch';
}
else {
$url = DIRECTORY_FALLBACK_MASTER . '/dirsearch';
}
$url = $directory['url'] . '/dirsearch';
}
$url .= '/sites';