diff options
author | Andreas Fischer <bantu@phpbb.com> | 2013-07-30 01:54:11 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-30 01:54:11 +0200 |
commit | 8a6f3a58000b7d969bd9108f2bdb34203354d39b (patch) | |
tree | 3ba64e72a3fbd88e164529c99bb055902815a9ec /phpBB/develop/mysql_upgrader.php | |
parent | Merge remote-tracking branch 'unknownbliss/ticket/11740' into prep-release-3.... (diff) | |
download | phpbb-8a6f3a58000b7d969bd9108f2bdb34203354d39b.tar.gz phpbb-8a6f3a58000b7d969bd9108f2bdb34203354d39b.tar.bz2 phpbb-8a6f3a58000b7d969bd9108f2bdb34203354d39b.zip |
[ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
... on PHP 5.4 or higher.
PHPBB3-11524
Diffstat (limited to 'phpBB/develop/mysql_upgrader.php')
-rw-r--r-- | phpBB/develop/mysql_upgrader.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index 05d279a099..17ce12e2bf 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -149,7 +149,8 @@ foreach ($schema_data as $table_name => $table_data) list($orig_column_type, $column_length) = explode(':', $column_data[0]); $column_type = sprintf($dbms_type_map['mysql_41'][$orig_column_type . ':'], $column_length); - if (isset($dbms_type_map['mysql_40'][$orig_column_type . ':']['limit'][0])) + if (isset($dbms_type_map['mysql_40'][$orig_column_type . ':']['limit']) && + isset($dbms_type_map['mysql_40'][$orig_column_type . ':']['limit'][0])) { switch ($dbms_type_map['mysql_40'][$orig_column_type . ':']['limit'][0]) { |