diff options
| author | Derky <derky@phpbb.com> | 2018-01-04 21:20:46 +0100 |
|---|---|---|
| committer | Derky <derky@phpbb.com> | 2018-01-04 21:20:46 +0100 |
| commit | 2fcb8ab87fb30c57b106695859c2661fc3cc2837 (patch) | |
| tree | 4e2a1437ff2cc9b3ca742716047660bf0367c824 /phpBB/phpbb/message | |
| parent | 0ff5f9fa0edf9ac3125cc4e871609a90cee1cfac (diff) | |
| parent | c1ec6517bfe0f080ad052e727073794583464bfb (diff) | |
| download | forums-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/message')
| -rw-r--r-- | phpBB/phpbb/message/form.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/message/message.php | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/phpbb/message/form.php b/phpBB/phpbb/message/form.php index 21d4de0b4d..63bada91ff 100644 --- a/phpBB/phpbb/message/form.php +++ b/phpBB/phpbb/message/form.php @@ -139,7 +139,7 @@ abstract class form $this->errors[] = 'FORM_INVALID'; } - if (!sizeof($this->errors)) + if (!count($this->errors)) { $sql = 'UPDATE ' . USERS_TABLE . ' SET user_emailtime = ' . time() . ' @@ -169,7 +169,7 @@ abstract class form add_form_key('memberlist_email'); $template->assign_vars(array( - 'ERROR_MESSAGE' => (sizeof($this->errors)) ? implode('<br />', $this->errors) : '', + 'ERROR_MESSAGE' => (count($this->errors)) ? implode('<br />', $this->errors) : '', )); } } diff --git a/phpBB/phpbb/message/message.php b/phpBB/phpbb/message/message.php index 5fd24b542e..fa701d1c77 100644 --- a/phpBB/phpbb/message/message.php +++ b/phpBB/phpbb/message/message.php @@ -209,7 +209,7 @@ class message */ public function cc_sender() { - if (!sizeof($this->recipients)) + if (!count($this->recipients)) { trigger_error('No email recipients specified'); } @@ -238,7 +238,7 @@ class message */ public function send(\messenger $messenger, $contact) { - if (!sizeof($this->recipients)) + if (!count($this->recipients)) { return; } @@ -271,7 +271,7 @@ class message 'MESSAGE' => htmlspecialchars_decode($this->body)) ); - if (sizeof($this->template_vars)) + if (count($this->template_vars)) { $messenger->assign_vars($this->template_vars); } |