GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

This commit is contained in:
Evan Prodromou 2010-01-07 14:56:09 -08:00
parent b2bab7d7ca 14421d9db3
commit c0a062dd85
6 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/shownotice.php
View File

@ -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;
}

2
classes/Notice.php
View File

@ -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)

2
lib/jabber.php
View File

@ -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) {

2
lib/noticelist.php
View File

@ -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{

4
lib/ping.php
View File

@ -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;
}
}

23
theme/cloudy/css/display.css
View File

@ -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;
}