forked from GNUsocial/gnu-social
Merge branch '0.7.x' of git://gitorious.org/laconica/dev into 0.7.x
This commit is contained in:
commit
4baef36243
@ -67,6 +67,7 @@ class ApiAction extends Action
|
|||||||
$this->process_command();
|
$this->process_command();
|
||||||
} else {
|
} else {
|
||||||
# basic authentication failed
|
# basic authentication failed
|
||||||
|
common_log(LOG_WARNING, "Failed API auth attempt, nickname: $nickname.");
|
||||||
$this->show_basic_auth_error();
|
$this->show_basic_auth_error();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,7 @@ INSERT INTO notice_source
|
|||||||
(code, name, url, created)
|
(code, name, url, created)
|
||||||
VALUES
|
VALUES
|
||||||
('adium', 'Adium', 'http://www.adiumx.com/', now()),
|
('adium', 'Adium', 'http://www.adiumx.com/', now()),
|
||||||
|
('Afficheur', 'Afficheur', 'http://afficheur.sourceforge.jp/', now()),
|
||||||
('AgentSolo.com','AgentSolo.com','http://www.agentsolo.com/', now()),
|
('AgentSolo.com','AgentSolo.com','http://www.agentsolo.com/', now()),
|
||||||
('anyio', 'Any.IO', 'http://any.io/', now()),
|
('anyio', 'Any.IO', 'http://any.io/', now()),
|
||||||
('betwittered','BeTwittered','http://www.32hours.com/betwitteredinfo/', now()),
|
('betwittered','BeTwittered','http://www.32hours.com/betwitteredinfo/', now()),
|
||||||
|
Loading…
Reference in New Issue
Block a user