From f6b8ee3e201647cbdee48f34a4f37f882f6607c2 Mon Sep 17 00:00:00 2001 From: El RIDO Date: Sun, 25 Dec 2016 12:15:29 +0100 Subject: [PATCH] add missing check for non-expiring pastes, fixes #149 --- CHANGELOG.md | 3 ++- lib/Data/Database.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f249b1c..c62d0c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,12 @@ # PrivateBin version history * **next (not yet released)** - * ADDED: Translations for Italian + * ADDED: Translations for Italian and Russian * ADDED: Loading message displayed until decryption succeeded for slower (in terms of CPU or network) systems * CHANGED: Using modal dialog to request password input instead of native JS input window (#69) * CHANGED: Suppressed referrer HTTP header sending when following links in a paste or comment (#96) and added additional HTTP headers for XSS mitigation (#91) * CHANGED: Updated random_compat and jQuery libraries + * FIXED: Automatic purging deleting non-expiring pastes, when using database store (#149) * **1.0 (2016-08-25)** * ADDED: Translations for Slowene and Chinese * ADDED: re-introduced (optional) URL shortener support, which was removed back in version 0.16 for privacy concerns diff --git a/lib/Data/Database.php b/lib/Data/Database.php index 1649575..7cfb104 100644 --- a/lib/Data/Database.php +++ b/lib/Data/Database.php @@ -417,7 +417,7 @@ class Database extends AbstractData $pastes = array(); $rows = self::_select( 'SELECT dataid FROM ' . self::_sanitizeIdentifier('paste') . - ' WHERE expiredate < ? LIMIT ?', array(time(), $batchsize) + ' WHERE expiredate < ? AND expiredate != ? LIMIT ?', array(time(), 0, $batchsize) ); if (count($rows)) { foreach ($rows as $row) {