diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-01 03:54:58 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-01 03:54:58 -0400 |
commit | bbd86382a61ac814a84d50a871cd32989b1d73c3 (patch) | |
tree | b3ce88664fa4b0fb403767673dbfc52a4c52e7b1 /include | |
parent | ed8c5954a9189569a94e9a519f86ca2c8c88db50 (diff) | |
parent | e97d90820dd03cfbb4599c3fe1551f3d198e5e0c (diff) | |
download | volse-hubzilla-bbd86382a61ac814a84d50a871cd32989b1d73c3.tar.gz volse-hubzilla-bbd86382a61ac814a84d50a871cd32989b1d73c3.tar.bz2 volse-hubzilla-bbd86382a61ac814a84d50a871cd32989b1d73c3.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
line 86: s/Friendika/Friendica/
fix "between yourself and You" in mail list
* master:
Diffstat (limited to 'include')
-rwxr-xr-x | include/api.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/api.php b/include/api.php index 64772d657..065f14cff 100755 --- a/include/api.php +++ b/include/api.php @@ -83,7 +83,7 @@ $record = $r[0]; } else { logger('API_login failure: ' . print_r($_SERVER,true), LOGGER_DEBUG); - header('WWW-Authenticate: Basic realm="Friendika"'); + header('WWW-Authenticate: Basic realm="Friendica"'); header('HTTP/1.0 401 Unauthorized'); die('This api requires login'); } |