Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 12:35:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into pocorate

Browse source
This commit is contained in:
friendica 2015-02-02 17:33:55 -08:00
commit 03bb236651
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
boot.php
View file

@ -2200,6 +2200,13 @@ function get_directory_realm() {
* @return string
*/
function get_directory_primary() {
$dirmode = intval(get_config('system','directory_mode'));
if($dirmode == DIRECTORY_MODE_STANDALONE || $dirmode == DIRECTORY_MODE_PRIMARY) {
return z_root();
}
if($x = get_config('system', 'directory_primary'))
return $x;

11
mod/regdir.php
View file

@ -47,9 +47,14 @@ function regdir_init(&$a) {
json_return_and_die($result);
}
else {
$r = q("select site_url from site where site_flags in ( 1, 2 ) and site_realm = '%s'",
dbesc(get_directory_realm())
);
if($dirmode == DIRECTORY_MODE_STANDALONE) {
$r = array(array('site_url' => z_root()));
}
else {
$r = q("select site_url from site where site_flags in ( 1, 2 ) and site_realm = '%s'",
dbesc(get_directory_realm())
);
}
if($r) {
$result['success'] = true;
$result['directories'] = array();