summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2010-02-22 11:53:34 +0100
committerSarven Capadisli <csarven@status.net>2010-02-22 11:53:34 +0100
commitf54c9b70dbabb70de93fcdd896297adfff5494f4 (patch)
treef457736c088835ddec22f68bbd139883a5485905
parent17ed30dffc1c05259baf2f0387089547e39684d7 (diff)
Fixed error/warning message location in OStatus autorize subscription page
-rw-r--r--plugins/OStatus/actions/ostatussub.php14
1 files changed, 8 insertions, 6 deletions
diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php
index bbbd1b7e6..8cb8e2ae7 100644
--- a/plugins/OStatus/actions/ostatussub.php
+++ b/plugins/OStatus/actions/ostatussub.php
@@ -58,6 +58,13 @@ class OStatusSubAction extends Action
$this->showPage();
}
+ function showPageNotice()
+ {
+ if ($this->error) {
+ $this->element('p', 'error', $this->error);
+ }
+ }
+
/**
* Content area of the page
*
@@ -69,11 +76,6 @@ class OStatusSubAction extends Action
function showContent()
{
- // @fixme is this right place?
- if ($this->error) {
- $this->text($this->error);
- }
-
$user = common_current_user();
$profile = $user->getProfile();
@@ -255,7 +257,7 @@ class OStatusSubAction extends Action
{
if ($this->validateFeed()) {
$this->preview = true;
- $this->showForm(_m('Previewing feed:'));
+ $this->showForm();
}
}