aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/install/helper/iohandler
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-12-22 15:40:48 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-12-22 15:40:48 +0100
commit332ca57942092a691463281c38b2285a45c95d16 (patch)
tree8f14add298fcf637650f2a6deceeef750ee4914a /phpBB/phpbb/install/helper/iohandler
parentc2a5411dcb50a732585ab72844fed88dc7770edc (diff)
parent2fe81c1ccb20035c9d66503726a7ff8df8b7fd78 (diff)
downloadforums-332ca57942092a691463281c38b2285a45c95d16.tar
forums-332ca57942092a691463281c38b2285a45c95d16.tar.gz
forums-332ca57942092a691463281c38b2285a45c95d16.tar.bz2
forums-332ca57942092a691463281c38b2285a45c95d16.tar.xz
forums-332ca57942092a691463281c38b2285a45c95d16.zip
Merge pull request #4091 from marc1706/ticket/14373
[ticket/14373] Do not pass arrays to strpos() * marc1706/ticket/14373: [ticket/14373] Do not pass arrays to strpos()
Diffstat (limited to 'phpBB/phpbb/install/helper/iohandler')
-rw-r--r--phpBB/phpbb/install/helper/iohandler/iohandler_base.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/install/helper/iohandler/iohandler_base.php b/phpBB/phpbb/install/helper/iohandler/iohandler_base.php
index 8dee5390a9..7271fe9bc0 100644
--- a/phpBB/phpbb/install/helper/iohandler/iohandler_base.php
+++ b/phpBB/phpbb/install/helper/iohandler/iohandler_base.php
@@ -101,7 +101,7 @@ abstract class iohandler_base implements iohandler_interface
*/
public function add_error_message($error_title, $error_description = false)
{
- if (strpos($error_title, '<br />') !== false)
+ if (!is_array($error_title) && strpos($error_title, '<br />') !== false)
{
$error_title = strip_tags(htmlspecialchars_decode($error_title));
}