diff options
| -rw-r--r-- | core/DataAccess/Model.php | 4 | ||||
| -rw-r--r-- | plugins/SegmentEditor/Model.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/DataAccess/Model.php b/core/DataAccess/Model.php index 3848c6defa..e6e821e1a6 100644 --- a/core/DataAccess/Model.php +++ b/core/DataAccess/Model.php @@ -632,10 +632,10 @@ class Model private function getDeletedSegmentWhereClause(array $segment) { $idSite = (int)$segment['enable_only_idsite']; - $segmentHash = $segment['hash']; + $segmentHash = $segment['hash'] ?? ''; // Valid segment hashes are md5 strings - just confirm that it is so it's safe for SQL injection if (!ctype_xdigit($segmentHash)) { - throw new Exception($segment . ' expected to be an md5 hash'); + throw new Exception($segmentHash . ' expected to be an md5 hash'); } $nameClause = 'name LIKE "done' . $segmentHash . '%"'; diff --git a/plugins/SegmentEditor/Model.php b/plugins/SegmentEditor/Model.php index f876d2a46c..dcd18c1e3b 100644 --- a/plugins/SegmentEditor/Model.php +++ b/plugins/SegmentEditor/Model.php @@ -139,7 +139,7 @@ class Model public function getSegmentsDeletedSince(Date $date) { $dateStr = $date->getDatetime(); - $sql = "SELECT DISTINCT definition, enable_only_idsite FROM " . Common::prefixTable('segment') + $sql = "SELECT DISTINCT `definition`, `enable_only_idsite`, `hash` FROM " . Common::prefixTable('segment') . " WHERE deleted = 1 AND ts_last_edit >= ?"; $deletedSegments = Db::fetchAll($sql, array($dateStr)); |