aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2014-12-09 15:59:05 -0800
committerCesar G <prototech91@gmail.com>2014-12-09 15:59:05 -0800
commit1aea572acab3f632e5ba15d8d0f3151421c50f83 (patch)
tree300dd6d9ea7575d9b49aa54f037ecb30607b6a97
parent641a9e5441dfe749187ba8b5cd3fa0c2b49a09f9 (diff)
downloadforums-1aea572acab3f632e5ba15d8d0f3151421c50f83.tar
forums-1aea572acab3f632e5ba15d8d0f3151421c50f83.tar.gz
forums-1aea572acab3f632e5ba15d8d0f3151421c50f83.tar.bz2
forums-1aea572acab3f632e5ba15d8d0f3151421c50f83.tar.xz
forums-1aea572acab3f632e5ba15d8d0f3151421c50f83.zip
[ticket/13370] Allow calling class method in convertor framework directly.
This change allows the usage of array($class, 'method')) directly instead of having to use the functionX syntax as follows: array('function1' => array($class, 'method'))) PHPBB3-13370
-rw-r--r--phpBB/install/install_convert.php2
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];