aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/install/convertors/functions_phpbb20.php6
2 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 4d52e30a61..d4f6a1149c 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -186,6 +186,7 @@ p a {
<ul class="menu">
<li>[Fix] Re-allow searching within the memberlist</li>
+ <li>[Fix] Force prune related values to integers during conversions</li>
</ul>
</div>
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index eca72b64bd..9b5e236b6d 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -216,10 +216,10 @@ function phpbb_insert_forums()
'forum_type' => FORUM_POST,
'forum_status' => is_item_locked($row['forum_status']),
'enable_prune' => ($prune_enabled) ? $row['prune_enable'] : 0,
- 'prune_next' => null_to_zero($row['prune_next']),
- 'prune_days' => null_to_zero($row['prune_days']),
+ 'prune_next' => (int) null_to_zero($row['prune_next']),
+ 'prune_days' => (int) null_to_zero($row['prune_days']),
'prune_viewed' => 0,
- 'prune_freq' => null_to_zero($row['prune_freq']),
+ 'prune_freq' => (int) null_to_zero($row['prune_freq']),
'forum_flags' => phpbb_forum_flags(),