Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-22 17:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	mod/crepair.php
This commit is contained in:
Michael Vogel 2014-01-05 16:22:42 +01:00
commit aed28a24f1
35 changed files with 9339 additions and 8738 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/api.php
View file

@ -74,7 +74,7 @@
logger('API_login: ' . print_r($_SERVER,true), LOGGER_DEBUG);
header('WWW-Authenticate: Basic realm="Friendica"');
header('HTTP/1.0 401 Unauthorized');
die((api_error(&$a, 'json', "This api requires login")));
die((api_error($a, 'json', "This api requires login")));
//die('This api requires login');
}
@ -174,7 +174,7 @@
}
header("HTTP/1.1 404 Not Found");
logger('API call not implemented: '.$a->query_string." - ".print_r($_REQUEST,true));
return(api_error(&$a, $type, "not implemented"));
return(api_error($a, $type, "not implemented"));
}