From f8fbe3793680af1dae2db2829cfc84068831c52f Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Wed, 28 Jun 2017 00:58:03 +0700
Subject: [ticket/14972] replace all occurrences of sizeof() with the count()

PHPBB3-14972
---
 phpBB/includes/bbcode.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/bbcode.php')

diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 6572c0ad2c..239e5c8ad6 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -94,13 +94,13 @@ class bbcode
 						${$type}['replace'][] = $replace;
 					}
 
-					if (sizeof($str['search']))
+					if (count($str['search']))
 					{
 						$message = str_replace($str['search'], $str['replace'], $message);
 						$str = array('search' => array(), 'replace' => array());
 					}
 
-					if (sizeof($preg['search']))
+					if (count($preg['search']))
 					{
 						// we need to turn the entities back into their original form to allow the
 						// search patterns to work properly
@@ -191,7 +191,7 @@ class bbcode
 			}
 		}
 
-		if (sizeof($sql))
+		if (count($sql))
 		{
 			global $db;
 
-- 
cgit v1.2.1


From b148bb5d707d739e92b66205866a764a9aa133b5 Mon Sep 17 00:00:00 2001
From: Ruben Calvo <rubencm@gmail.com>
Date: Sun, 21 Oct 2018 05:56:29 +0000
Subject: [ticket/15849] Stop using php4 constructors

PHPBB3-15849
---
 phpBB/includes/bbcode.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/bbcode.php')

diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 239e5c8ad6..c00f9bd207 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -37,7 +37,7 @@ class bbcode
 	* Constructor
 	* Init bbcode cache entries if bitfield is specified
 	*/
-	function bbcode($bitfield = '')
+	function __construct($bitfield = '')
 	{
 		if ($bitfield)
 		{
-- 
cgit v1.2.1


From da9da88d11f1d62105268def24ae70c0e64bb840 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Sun, 18 Nov 2018 01:33:56 +0700
Subject: [ticket/15875] Fix PHP fatal error on BBCode parsing

PHPBB3-15875
---
 phpBB/includes/bbcode.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/bbcode.php')

diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index c00f9bd207..c31b63a403 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -35,9 +35,18 @@ class bbcode
 
 	/**
 	* Constructor
-	* Init bbcode cache entries if bitfield is specified
 	*/
 	function __construct($bitfield = '')
+	{
+		$this->bbcode_set_bitfield($bitfield);
+	}
+
+	/**
+	* Init bbcode cache entries if bitfield is specified
+	*
+	* @param	string	$bbcode_bitfield	The bbcode bitfield
+	*/
+	function bbcode_set_bitfield($bitfield = '')
 	{
 		if ($bitfield)
 		{
-- 
cgit v1.2.1