revert length keep impression data, modify _ in knowledge wiki kwiki-seeds insertions, a=chris
revert length keep impression data, modify _ in knowledge wiki kwiki-seeds insertions, a=chris
diff --git a/src/configs/TokenTool.php b/src/configs/TokenTool.php
index b3e8673f7..52bb8c73f 100644
--- a/src/configs/TokenTool.php
+++ b/src/configs/TokenTool.php
@@ -580,7 +580,7 @@ function makeKwikiEntriesGetSeedSites($locale_tag, $page_count_file,
$abstract = wikiHeaderPageToString("", $abstract);
$verticals_model->setPageName(C\ROOT_ID,
C\SEARCH_GROUP_ID, mb_strtolower(
- str_replace("-", " ", $query)), $abstract,
+ preg_replace("/-|\s/u", "_", $query)), $abstract,
$locale_tag, time(), $query, "", "", [], false);
}
}
diff --git a/src/models/ImpressionModel.php b/src/models/ImpressionModel.php
index 14d82fe06..c4051cba9 100644
--- a/src/models/ImpressionModel.php
+++ b/src/models/ImpressionModel.php
@@ -223,10 +223,10 @@ class ImpressionModel extends Model
}
// delete user data older than one year
$sql = "DELETE FROM ITEM_IMPRESSION WHERE VIEW_DATE < ?";
- $db->execute($sql, [$timestamps[C\ONE_DAY]]);
+ $db->execute($sql, [$timestamp]);
$sql = "DELETE FROM ITEM_IMPRESSION_SUMMARY WHERE UPDATE_TIMESTAMP < ?".
" AND UPDATE_PERIOD > ". C\FOREVER;
- $db->execute($sql, [$timestamps[C\ONE_YEAR]]);
+ $db->execute($sql, [$timestamp]);
}
/**
* Used to return an array of impression statistics for a particular update
diff --git a/src/models/SearchverticalsModel.php b/src/models/SearchverticalsModel.php
index fab50ad69..1e6ebf220 100644
--- a/src/models/SearchverticalsModel.php
+++ b/src/models/SearchverticalsModel.php
@@ -235,7 +235,7 @@ class SearchverticalsModel extends GroupModel
public function getKnowledgeWiki($query, $locale_tag, $edit_mode = false)
{
$db = $this->db;
- $query = mb_strtolower(str_replace("-", " ", $query));
+ $query = mb_strtolower(preg_replace("/-|\s/u", "_", $query));
if ($edit_mode) {
$row = $this->getPageInfoByName(C\SEARCH_GROUP_ID, $query,
$locale_tag, "edit");