We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit ce404255 authored by Evan Prodromou's avatar Evan Prodromou

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

parents 674b0dda 9cb0dab2
......@@ -56,7 +56,7 @@ class FoafGroupAction extends Action
return false;
}
$local = Local_group::staticGet('nickname', $nickname);
$local = Local_group::staticGet('nickname', $this->nickname);
if (!$local) {
$this->clientError(_('No such group.'), 404);
......@@ -126,7 +126,8 @@ class FoafGroupAction extends Action
while ($members->fetch()) {
$member_uri = common_local_url('userbyid', array('id'=>$members->id));
$member_details[$member_uri] = array(
'nickname' => $members->nickname
'nickname' => $members->nickname,
'is_admin' => false,
);
$this->element('member', array('rdf:resource' => $member_uri));
}
......
......@@ -964,11 +964,19 @@ class Notice extends Memcached_DataObject
*/
function saveKnownReplies($uris)
{
if (empty($uris)) {
return;
}
$sender = Profile::staticGet($this->profile_id);
foreach ($uris as $uri) {
$user = User::staticGet('uri', $uri);
if (!empty($user)) {
if ($user->hasBlocked($sender)) {
continue;
}
$reply = new Reply();
......
......@@ -845,14 +845,16 @@ class Action extends HTMLOutputter // lawsuit
'width' => '80',
'height' => '15'));
$this->text(' ');
//TODO: This is dirty: i18n
$this->text(_('All '.common_config('site', 'name').' content and data are available under the '));
$this->element('a', array('class' => 'license',
'rel' => 'external license',
'href' => common_config('license', 'url')),
common_config('license', 'title'));
$this->text(' ');
$this->text(_('license.'));
// 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.
$notice = _('All %1$s content and data are available under the %2$s license.');
$link = "<a class=\"license\" rel=\"external license\" href=\"" .
htmlspecialchars(common_config('license', 'url')) .
"\">" .
htmlspecialchars(common_config('license', 'title')) .
"</a>";
$this->raw(sprintf(htmlspecialchars($notice),
htmlspecialchars(common_config('site', 'name')),
$link));
$this->elementEnd('p');
break;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment