fixing regressions from cherrypicking

This commit is contained in:
El RIDO
2015-08-15 21:39:08 +02:00
parent 5f87ea6843
commit e646729b2d
4 changed files with 6 additions and 7 deletions

View File

@@ -372,7 +372,7 @@ class zerobin
private function _read($dataid)
{
// Is this a valid paste identifier?
if (preg_match('\A[a-f\d]{16}\z', $dataid))
if (preg_match('#\A[a-f\d]{16}\z#', $dataid))
{
// Check that paste exists.
if ($this->_model()->exists($dataid))
@@ -452,6 +452,7 @@ class zerobin
$key;
}
RainTPL::$path_replace = false;
$page = new RainTPL;
// we escape it here because ENT_NOQUOTES can't be used in RainTPL templates
$page->assign('CIPHERDATA', htmlspecialchars($this->_data, ENT_NOQUOTES));