aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/tree
diff options
context:
space:
mode:
authorDerky <derky@phpbb.com>2018-01-04 21:20:46 +0100
committerDerky <derky@phpbb.com>2018-01-04 21:20:46 +0100
commit2fcb8ab87fb30c57b106695859c2661fc3cc2837 (patch)
tree4e2a1437ff2cc9b3ca742716047660bf0367c824 /phpBB/phpbb/tree
parent0ff5f9fa0edf9ac3125cc4e871609a90cee1cfac (diff)
parentc1ec6517bfe0f080ad052e727073794583464bfb (diff)
downloadforums-2fcb8ab87fb30c57b106695859c2661fc3cc2837.tar
forums-2fcb8ab87fb30c57b106695859c2661fc3cc2837.tar.gz
forums-2fcb8ab87fb30c57b106695859c2661fc3cc2837.tar.bz2
forums-2fcb8ab87fb30c57b106695859c2661fc3cc2837.tar.xz
forums-2fcb8ab87fb30c57b106695859c2661fc3cc2837.zip
Merge pull request #5069 from marc1706/ticket/14972-rhea
[ticket/14972] Backport for PHP 7.2 compatibility
Diffstat (limited to 'phpBB/phpbb/tree')
-rw-r--r--phpBB/phpbb/tree/nestedset.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/tree/nestedset.php b/phpBB/phpbb/tree/nestedset.php
index 7149513fd9..c02deaebf4 100644
--- a/phpBB/phpbb/tree/nestedset.php
+++ b/phpBB/phpbb/tree/nestedset.php
@@ -706,7 +706,7 @@ abstract class nestedset implements \phpbb\tree\tree_interface
{
$acquired_new_lock = $this->acquire_lock();
- $diff = sizeof($subset_items) * 2;
+ $diff = count($subset_items) * 2;
$sql_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items);
$sql_not_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items, true);
@@ -746,7 +746,7 @@ abstract class nestedset implements \phpbb\tree\tree_interface
*/
protected function prepare_adding_subset(array $subset_items, array $new_parent)
{
- $diff = sizeof($subset_items) * 2;
+ $diff = count($subset_items) * 2;
$sql_not_subset_items = $this->db->sql_in_set($this->column_item_id, $subset_items, true);
$set_left_id = $this->db->sql_case($this->column_left_id . ' > ' . (int) $new_parent[$this->column_right_id], $this->column_left_id . ' + ' . $diff, $this->column_left_id);