Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

6 files changed, 22 insertions, 13 deletions

diff --git a/actions/shownotice.php b/actions/shownotice.php
index 5d16fdad9..d09100f67 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -103,7 +103,7 @@ class ShownoticeAction extends OwnerDesignAction
 
         $this->user = User::staticGet('id', $this->profile->id);
 
-        if (! $this->notice->is_local) {
+        if ($this->notice->is_local == Notice::REMOTE_OMB) {
             common_redirect($this->notice->uri);
             return false;
         }
diff --git a/classes/Notice.php b/classes/Notice.php
index 9fa022650..9bda47827 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -63,7 +63,7 @@ class Notice extends Memcached_DataObject
     public $created;                         // datetime  multiple_key not_null default_0000-00-00%2000%3A00%3A00
     public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
     public $reply_to;                        // int(4)
-    public $is_local;                        // tinyint(1)
+    public $is_local;                        // int(4)
     public $source;                          // varchar(32)
     public $conversation;                    // int(4)
     public $lat;                             // decimal(10,7)
diff --git a/lib/jabber.php b/lib/jabber.php
index 01aed8ffa..a821856a8 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -440,7 +440,7 @@ function jabber_public_notice($notice)
     // XXX: should we send out non-local messages if public,localonly
     // = false? I think not
 
-    if ($public && $notice->is_local) {
+    if ($public && $notice->is_local == Notice::LOCAL_PUBLIC) {
         $profile = Profile::staticGet($notice->profile_id);
 
         if (!$profile) {
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 5eb2633ac..78abf34a7 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -379,7 +379,7 @@ class NoticeListItem extends Widget
 
     function showNoticeLink()
     {
-        if($this->notice->is_local){
+        if($this->notice->is_local == Notice::LOCAL_PUBLIC || $this->notice->is_local == Notice::LOCAL_NONPUBLIC){
             $noticeurl = common_local_url('shownotice',
                                       array('notice' => $this->notice->id));
         }else{
diff --git a/lib/ping.php b/lib/ping.php
index 5698c4038..735af9ef1 100644
--- a/lib/ping.php
+++ b/lib/ping.php
@@ -21,7 +21,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 function ping_broadcast_notice($notice) {
 
-	if (!$notice->is_local) {
+	if ($notice->is_local != Notice::LOCAL_PUBLIC && $notice->is_local != Notice::LOCAL_NONPUBLIC) {
 		return true;
 	}
 
@@ -115,4 +115,4 @@ function ping_notice_tags($notice) {
 		return implode('|', $tags);
 	}
 	return NULL;
-}
\ No newline at end of file
+}
diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index a27bd74b8..6986222bb 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -1518,12 +1518,7 @@ min-width:0;
 #subscribers.user_in #content,
 #showgroup.user_in #content,
 #conversation.user_in #content,
-#attachment.user_in #content,
-#siteadminpanel.user_in #content,
-#designadminpanel.user_in #content,
-#useradminpanel.user_in #content,
-#pathsadminpanel.user_in #content,
-#adminprofileflag.user_in #content {
+#attachment.user_in #content {
 padding-top:12.5em;
 }
 
@@ -1550,10 +1545,24 @@ padding-top:12.5em;
 #register #form_notice,
 #shownotice #form_notice,
 #confirmaddress #form_notice,
-#tag #form_notice {
+#tag #form_notice,
+#siteadminpanel #form_notice,
+#designadminpanel #form_notice,
+#useradminpanel #form_notice,
+#pathsadminpanel #form_notice,
+#adminprofileflag #form_notice {
 display:none;
 }
 
+#public #core,
+#showstream #core {
+margin-top:10em;
+}
+#public.user_in #core,
+#showstream.user_in #core {
+margin-top:0;
+}
+
 #jOverlayContent #core #content {
 padding-top:11px;
 }