Merge branch 'master' into testing

This commit is contained in:
Brion Vibber 2010-04-19 19:46:11 +02:00
commit 2af12774bf
2 changed files with 14 additions and 0 deletions

0
avatar/.gitignore vendored Normal file → Executable file
View File

View File

@ -446,4 +446,18 @@ class OStatusSubAction extends Action
{
return common_local_url('ostatussub');
}
/**
* Disable the send-notice form at the top of the page.
* This is really just a hack for the broken CSS in the Cloudy theme,
* I think; copying from other non-notice-navigation pages that do this
* as well. There will be plenty of others also broken.
*
* @fixme fix the cloudy theme
* @fixme do this in a more general way
*/
function showNoticeForm() {
// nop
}
}