Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links
# Conflicts: # include/follow.php
This commit is contained in:
commit
e8e1f9253d
148 changed files with 12178 additions and 11976 deletions
|
@ -6,7 +6,9 @@ require_once("include/crypto.php");
|
|||
require_once("include/diaspora.php");
|
||||
require_once("include/xml.php");
|
||||
|
||||
function fetch_init($a){
|
||||
/// @TODO You always make it like this: function foo(&$a)
|
||||
/// @TODO This means that the value of $a can be changed in anything, remove & and use App as type-hint
|
||||
function fetch_init(&$a){
|
||||
|
||||
if (($a->argc != 3) OR (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
|
||||
header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue