chalec
/
ctrlv-privatebin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removing leftover from previously using a different function, resolves #83

This commit is contained in:
El RIDO 2016-07-06 09:41:07 +02:00
parent d664af6ce5
commit 6b0b814dc6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/zerobin/db.php
View File

@ -607,7 +607,7 @@ class zerobin_db extends zerobin_abstract
case '0.21': case '0.21':
// create the meta column if necessary (pre 0.21 change) // create the meta column if necessary (pre 0.21 change)
try { try {
self::$_db->exec('SELECT meta FROM ' . self::$_prefix . 'paste LIMIT 1;', array()); self::$_db->exec('SELECT meta FROM ' . self::$_prefix . 'paste LIMIT 1;');
} catch (PDOException $e) { } catch (PDOException $e) {
self::$_db->exec('ALTER TABLE ' . self::$_prefix . 'paste ADD COLUMN meta TEXT;'); self::$_db->exec('ALTER TABLE ' . self::$_prefix . 'paste ADD COLUMN meta TEXT;');
} }

6
tst/zerobin.php
View File

@ -295,7 +295,7 @@ class zerobinTest extends PHPUnit_Framework_TestCase
); );
$this->assertTrue($this->_model->exists($response['id']), 'paste exists after posting data'); $this->assertTrue($this->_model->exists($response['id']), 'paste exists after posting data');
$paste = $this->_model->read($response['id']); $paste = $this->_model->read($response['id']);
$this->assertEquals($time + 300, $paste->meta->expire_date, 'time is set correctly'); $this->assertGreaterThanOrEqual($time + 300, $paste->meta->expire_date, 'time is set correctly');
} }
/** /**
@ -327,8 +327,8 @@ class zerobinTest extends PHPUnit_Framework_TestCase
); );
$this->assertTrue($this->_model->exists($response['id']), 'paste exists after posting data'); $this->assertTrue($this->_model->exists($response['id']), 'paste exists after posting data');
$paste = $this->_model->read($response['id']); $paste = $this->_model->read($response['id']);
$this->assertEquals($time + 300, $paste->meta->expire_date, 'time is set correctly'); $this->assertGreaterThanOrEqual($time + 300, $paste->meta->expire_date, 'time is set correctly');
$this->assertEquals(1, $paste->meta->opendiscussion, 'time is set correctly'); $this->assertEquals(1, $paste->meta->opendiscussion, 'discussion is enabled');
} }
/** /**