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

Merge branch 'master' of git.gnu.io:gnu/gnu-social into nightly

Browse Source 
Conflicts:
	plugins/OStatus/OStatusPlugin.php

master vs. nightly thing
This commit is contained in:
Mikael Nordfeldth
2015-11-05 16:16:02 +01:00
parent 0e32729e59 f345f1d605
commit 7ccd36849e
7 changed files with 281 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/OStatus/classes/FeedSub.php
View File

@@ -295,7 +295,7 @@ class FeedSub extends Managed_DataObject
{
$fs = new FeedSub();
// the "" empty string check is because we historically haven't saved unsubscribed feeds as NULL
$fs->whereAdd('sub_end IS NOT NULL AND sub_end!="" AND sub_end < NOW() - INTERVAL 1 day');
$fs->whereAdd('sub_end IS NOT NULL AND sub_end!="" AND sub_end < NOW() + INTERVAL 1 day');
if (!$fs->find()) { // find can be both false and 0, depending on why nothing was found
throw new NoResultException($fs);
}