summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-06-11 14:13:34 -0400
committerEvan Prodromou <evan@prodromou.name>2008-06-11 14:13:34 -0400
commitf4ed6059980afdaede47e33307c6432e83aea484 (patch)
tree8a3792052cf8d0949f5463155a54709a26b888ff
parentd1215c4a85772ca21c4effd6a50103be157e7d08 (diff)
only show notice form if user is logged in, looking at own page
darcs-hash:20080611181334-84dde-e9045179a94f8c78af9d660c57a37ce6f5fc9776.gz
-rw-r--r--actions/all.php6
-rw-r--r--actions/showstream.php6
-rw-r--r--lib/util.php3
3 files changed, 12 insertions, 3 deletions
diff --git a/actions/all.php b/actions/all.php
index 83401d422..06d88477d 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -47,6 +47,12 @@ class AllAction extends StreamAction {
common_show_header($profile->nickname . _t(" and friends"),
array($this, 'show_header'), $user);
+ $cur = common_current_user();
+
+ if ($cur && $cur->id == $profile->id) {
+ common_notice_form();
+ }
+
$this->views_menu();
$this->show_notices($profile);
diff --git a/actions/showstream.php b/actions/showstream.php
index 2130251ce..6fed6df12 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -53,6 +53,12 @@ class ShowstreamAction extends StreamAction {
$user->nickname)));
common_show_header($profile->nickname, array($this, 'show_header'), $user);
+
+ $cur = common_current_user();
+
+ if ($cur && $cur->id == $profile->id) {
+ common_notice_form();
+ }
$this->views_menu();
diff --git a/lib/util.php b/lib/util.php
index c6f32eeb7..aa0b8f02c 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -170,9 +170,6 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $notice=NULL
'alt' => $config['site']['name'],
'id' => 'logo'));
common_element_end('a');
- if (common_logged_in()) {
- common_notice_form();
- }
common_element_end('div');
common_element_start('div', array('id' => 'content'));
}