summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-05-29 19:37:40 +0000
committerEvan Prodromou <evan@controlyourself.ca>2009-05-29 19:37:40 +0000
commit4baef3624384bb1a72ddc0937cb2bae0ee6809b2 (patch)
treea0b75a17b2c96c96ed3cba56b9c5f7e6dc1af270
parent3532cd0490a70b54a92108549de6042459fd8469 (diff)
parent6885f082ea4191702b525bd5ad693baa13de8879 (diff)
Merge branch '0.7.x' of git://gitorious.org/laconica/dev into 0.7.x
-rw-r--r--actions/api.php1
-rw-r--r--db/notice_source.sql1
2 files changed, 2 insertions, 0 deletions
diff --git a/actions/api.php b/actions/api.php
index 8762b4bcd..b25ba99f3 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -67,6 +67,7 @@ class ApiAction extends Action
$this->process_command();
} else {
# basic authentication failed
+ common_log(LOG_WARNING, "Failed API auth attempt, nickname: $nickname.");
$this->show_basic_auth_error();
}
}
diff --git a/db/notice_source.sql b/db/notice_source.sql
index b1309acd6..cf4bd3db4 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -2,6 +2,7 @@ INSERT INTO notice_source
(code, name, url, created)
VALUES
('adium', 'Adium', 'http://www.adiumx.com/', now()),
+ ('Afficheur', 'Afficheur', 'http://afficheur.sourceforge.jp/', now()),
('AgentSolo.com','AgentSolo.com','http://www.agentsolo.com/', now()),
('anyio', 'Any.IO', 'http://any.io/', now()),
('betwittered','BeTwittered','http://www.32hours.com/betwitteredinfo/', now()),