eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into 0.9.x

This commit is contained in:
Evan Prodromou 2009-12-29 12:09:17 -08:00
parent a1e5996404 45c4078ca9
commit 05e2b4d92d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Notice.php
View File

@ -1129,7 +1129,7 @@ class Notice extends Memcached_DataObject
$xs->element('id', null, $this->uri);
$xs->element('published', null, common_date_w3dtf($this->created));
$xs->element('updated', null, common_date_w3dtf($this->modified));
$xs->element('updated', null, common_date_w3dtf($this->created));
if ($this->reply_to) {
$reply_notice = Notice::staticGet('id', $this->reply_to);

4
plugins/UserFlag/UserFlagPlugin.php
View File

@ -251,7 +251,9 @@ class UserFlagPlugin extends Plugin
function onEndBlockProfile($user, $profile)
{
if ($this->flagOnBlock) {
if ($this->flagOnBlock && !User_flag_profile::exists($profile->id,
$user->id)) {
User_flag_profile::create($user->id, $profile->id);
}
return true;