wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitorious.org:statusnet/mainline

Browse Source
This commit is contained in:
Evan Prodromou 2010-04-09 14:06:24 -04:00
commit ce40425533
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actions/foafgroup.php
View File

@ -56,7 +56,7 @@ class FoafGroupAction extends Action
return false; return false;
} }
$local = Local_group::staticGet('nickname', $nickname); $local = Local_group::staticGet('nickname', $this->nickname);
if (!$local) { if (!$local) {
$this->clientError(_('No such group.'), 404); $this->clientError(_('No such group.'), 404);
@ -126,7 +126,8 @@ class FoafGroupAction extends Action
while ($members->fetch()) { while ($members->fetch()) {
$member_uri = common_local_url('userbyid', array('id'=>$members->id)); $member_uri = common_local_url('userbyid', array('id'=>$members->id));
$member_details[$member_uri] = array( $member_details[$member_uri] = array(
'nickname' => $members->nickname 'nickname' => $members->nickname,
'is_admin' => false,
); );
$this->element('member', array('rdf:resource' => $member_uri)); $this->element('member', array('rdf:resource' => $member_uri));
} }

8
classes/Notice.php
View File

@ -964,11 +964,19 @@ class Notice extends Memcached_DataObject
*/ */
function saveKnownReplies($uris) function saveKnownReplies($uris)
{ {
if (empty($uris)) {
return;
}
$sender = Profile::staticGet($this->profile_id);
foreach ($uris as $uri) { foreach ($uris as $uri) {
$user = User::staticGet('uri', $uri); $user = User::staticGet('uri', $uri);
if (!empty($user)) { if (!empty($user)) {
if ($user->hasBlocked($sender)) {
continue;
}
$reply = new Reply(); $reply = new Reply();

18
lib/action.php
View File

@ -845,14 +845,16 @@ class Action extends HTMLOutputter // lawsuit
'width' => '80', 'width' => '80',
'height' => '15')); 'height' => '15'));
$this->text(' '); $this->text(' ');
//TODO: This is dirty: i18n // TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
$this->text(_('All '.common_config('site', 'name').' content and data are available under the ')); $notice = _('All %1$s content and data are available under the %2$s license.');
$this->element('a', array('class' => 'license', $link = "<a class=\"license\" rel=\"external license\" href=\"" .
'rel' => 'external license', htmlspecialchars(common_config('license', 'url')) .
'href' => common_config('license', 'url')), "\">" .
common_config('license', 'title')); htmlspecialchars(common_config('license', 'title')) .
$this->text(' '); "</a>";
$this->text(_('license.')); $this->raw(sprintf(htmlspecialchars($notice),
htmlspecialchars(common_config('site', 'name')),
$link));
$this->elementEnd('p'); $this->elementEnd('p');
break; break;
} }