summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-04-19 19:46:46 +0200
committerBrion Vibber <brion@pobox.com>2010-04-19 19:46:46 +0200
commit056cce4b5eed28751bbad97e0dc826ee5310ff39 (patch)
treec7943447e8fcc63cf0d756aa9b84b9b87a633729
parente7c112ccd61d2503413716029dcb257994188594 (diff)
parent2af12774bf9699b7234e3015dc4eb14b1cdff13d (diff)
Merge branch 'testing' into 0.9.x
-rwxr-xr-x[-rw-r--r--]avatar/.gitignore0
-rw-r--r--plugins/OStatus/actions/ostatussub.php14
2 files changed, 14 insertions, 0 deletions
diff --git a/avatar/.gitignore b/avatar/.gitignore
index e69de29bb..e69de29bb 100644..100755
--- a/avatar/.gitignore
+++ b/avatar/.gitignore
diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php
index 994af6e95..28714514f 100644
--- a/plugins/OStatus/actions/ostatussub.php
+++ b/plugins/OStatus/actions/ostatussub.php
@@ -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
+ }
+
}