Skip to content
Snippets Groups Projects
Commit bac35e9a authored by Elmar Ludwig's avatar Elmar Ludwig
Browse files

don't skip DoGarbageCollect() completely when NEWS_DISABLE_GARBAGE_COLLECT is set, fixes #1355

Closes #1355

Merge request studip/studip!837
parent de1ce33a
Branches
No related tags found
No related merge requests found
...@@ -58,7 +58,11 @@ class GarbageCollectorJob extends CronJob ...@@ -58,7 +58,11 @@ class GarbageCollectorJob extends CronJob
} }
// delete outdated news // delete outdated news
if (Config::get()->NEWS_DISABLE_GARBAGE_COLLECT) {
$news_deletion_days = false;
} else {
$news_deletion_days = $parameters['news_deletion_days'] * 86400; $news_deletion_days = $parameters['news_deletion_days'] * 86400;
}
$deleted_news = StudipNews::DoGarbageCollect($news_deletion_days); $deleted_news = StudipNews::DoGarbageCollect($news_deletion_days);
// delete messages // delete messages
......
...@@ -398,7 +398,6 @@ class StudipNews extends SimpleORMap implements PrivacyObject ...@@ -398,7 +398,6 @@ class StudipNews extends SimpleORMap implements PrivacyObject
public static function DoGarbageCollect($news_deletion_days = false) public static function DoGarbageCollect($news_deletion_days = false)
{ {
$db = DBManager::get(); $db = DBManager::get();
if (!Config::get()->NEWS_DISABLE_GARBAGE_COLLECT) {
$queries = []; $queries = [];
$parameters = []; $parameters = [];
...@@ -425,12 +424,12 @@ class StudipNews extends SimpleORMap implements PrivacyObject ...@@ -425,12 +424,12 @@ class StudipNews extends SimpleORMap implements PrivacyObject
if (count($result) > 0) { if (count($result) > 0) {
$query = "DELETE FROM news WHERE news_id IN (?)"; $query = "DELETE FROM news WHERE news_id IN (?)";
$statement = DBManager::get()->prepare($query); $statement = $db->prepare($query);
$statement->execute([$result]); $statement->execute([$result]);
$killed = $statement->rowCount(); $killed = $statement->rowCount();
$query = "DELETE FROM news_range WHERE news_id IN (?)"; $query = "DELETE FROM news_range WHERE news_id IN (?)";
$statement = DBManager::get()->prepare($query); $statement = $db->prepare($query);
$statement->execute([$result]); $statement->execute([$result]);
object_kill_visits(null, $result); object_kill_visits(null, $result);
...@@ -439,7 +438,6 @@ class StudipNews extends SimpleORMap implements PrivacyObject ...@@ -439,7 +438,6 @@ class StudipNews extends SimpleORMap implements PrivacyObject
} }
return $killed; return $killed;
} }
}
public static function DeleteNewsRanges($range_id) public static function DeleteNewsRanges($range_id)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment