aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-01-24 19:19:29 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-01-24 19:19:29 +0100
commit3a8305e19066fe03083104a0825300202cbd1ada (patch)
treed4aa1206694cb7d5bdc9f8dde34c39c80cdecb90
parent928a8c0e89f9ec4fe73d15087aa9000fba338669 (diff)
parentf08887e2774c480daf6b0d29dc949d2590472ee3 (diff)
downloadforums-3a8305e19066fe03083104a0825300202cbd1ada.tar
forums-3a8305e19066fe03083104a0825300202cbd1ada.tar.gz
forums-3a8305e19066fe03083104a0825300202cbd1ada.tar.bz2
forums-3a8305e19066fe03083104a0825300202cbd1ada.tar.xz
forums-3a8305e19066fe03083104a0825300202cbd1ada.zip
Merge pull request #5098 from VSEphpbb/ticket/15526
[ticket/15526] Cast bbcode id to INT in merge bbcodes migration
-rw-r--r--phpBB/phpbb/db/migration/data/v32x/merge_duplicate_bbcodes.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/migration/data/v32x/merge_duplicate_bbcodes.php b/phpBB/phpbb/db/migration/data/v32x/merge_duplicate_bbcodes.php
index 08609b571b..b1ee241f44 100644
--- a/phpBB/phpbb/db/migration/data/v32x/merge_duplicate_bbcodes.php
+++ b/phpBB/phpbb/db/migration/data/v32x/merge_duplicate_bbcodes.php
@@ -65,11 +65,11 @@ class merge_duplicate_bbcodes extends \phpbb\db\migration\container_aware_migrat
$sql = 'UPDATE ' . BBCODES_TABLE . '
SET ' . $this->db->sql_build_array('UPDATE', $bbcode_data) . '
- WHERE bbcode_id = ' . $without['bbcode_id'];
+ WHERE bbcode_id = ' . (int) $without['bbcode_id'];
$this->sql_query($sql);
$sql = 'DELETE FROM ' . BBCODES_TABLE . '
- WHERE bbcode_id = ' . $with['bbcode_id'];
+ WHERE bbcode_id = ' . (int) $with['bbcode_id'];
$this->sql_query($sql);
}
}