diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-12-27 14:07:43 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-12-27 14:07:43 +0100 |
| commit | 8049b5fd97a58fdf6b654d6d881450808ff5bf84 (patch) | |
| tree | 9735d264c5f5ac2f087c6e96f65bf403191ffe28 /phpBB/install | |
| parent | fbe0f0413243203c187e1c96e6c34dae051ea795 (diff) | |
| parent | a5922a0e8b6a774316a970de67a2447fde13b4de (diff) | |
| download | forums-8049b5fd97a58fdf6b654d6d881450808ff5bf84.tar forums-8049b5fd97a58fdf6b654d6d881450808ff5bf84.tar.gz forums-8049b5fd97a58fdf6b654d6d881450808ff5bf84.tar.bz2 forums-8049b5fd97a58fdf6b654d6d881450808ff5bf84.tar.xz forums-8049b5fd97a58fdf6b654d6d881450808ff5bf84.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/install_convert.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 17161b5eae..6a892a7373 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -2014,7 +2014,7 @@ class install_convert extends module { $value = $fields[1][$firstkey]; } - else if (is_array($fields[2])) + else if (is_array($fields[2]) && !is_callable($fields[2])) { // Execute complex function/eval/typecast $value = $fields[1]; |