Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

This commit is contained in:
Sarven Capadisli 2010-01-24 15:35:36 +01:00
commit 071f455b87
2 changed files with 3 additions and 3 deletions

View File

@ -115,11 +115,11 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction
$original = clone($profile);
if (empty($this->name)) {
if (!empty($this->name)) {
$profile->fullname = $this->name;
}
if (empty($this->url)) {
if (!empty($this->url)) {
$profile->homepage = $this->url;
}

View File

@ -86,7 +86,7 @@ class ImapPlugin extends Plugin
}
}
function onStartIoManagerClasses(&$classes)
function onStartQueueDaemonIoManagers(&$classes)
{
$classes[] = new ImapManager($this);
}