clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects 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
parent a2debaa68a 63e2695d22
commit e67133ef56
162 changed files with 798 additions and 757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mod/uimport.php
View File

@@ -6,7 +6,7 @@
require_once("include/uimport.php");
function uimport_post(App &$a) {
function uimport_post(App $a) {
switch($a->config['register_policy']) {
case REGISTER_OPEN:
$blocked = 0;
@@ -36,7 +36,7 @@ function uimport_post(App &$a) {
}
}
function uimport_content(App &$a) {
function uimport_content(App $a) {
if ((! local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {
notice("Permission denied." . EOL);