bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1701-curl-range

Browse source 
Conflicts:
	mod/oexchange.php
	mod/uimport.php
This commit is contained in:
Michael 2017-01-12 07:25:44 +00:00
commit e67133ef56
162 changed files with 798 additions and 757 deletions
Download patch file Download diff file Expand all files Collapse all files

5
mod/oexchange.php
View file

@ -1,6 +1,5 @@
<?php
function oexchange_init(App &$a) {
function oexchange_init(App $a) {
if (($a->argc > 1) && ($a->argv[1] === 'xrd')) {
$tpl = get_markup_template('oexchange_xrd.tpl');
@ -11,7 +10,7 @@ function oexchange_init(App &$a) {
}
}
function oexchange_content(App &$a) {
function oexchange_content(App $a) {
if (! local_user()) {
$o = login(false);