only show notice form if user is logged in, looking at own page

darcs-hash:20080611181334-84dde-e9045179a94f8c78af9d660c57a37ce6f5fc9776.gz

diff --git a/actions/all.php b/actions/all.php
index 83401d422d22cc667396ab726eed86c367062c1b..06d88477d5197db74e6f2e752e61b48ed1575cf8 100644 (file)
--- 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 2130251ce170936173dd218fe6ea56ace2e8fdbc..6fed6df1282046e3edaed30d85504ab441f9064c 100644 (file)
--- 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 c6f32eeb7f123cde6e4759698843b28abce2ecfe..aa0b8f02c1af5bde54b0956c71f41bd98bdd499b 100644 (file)
--- 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'));
 }