diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-30 11:26:21 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-30 11:26:21 +0200 |
| commit | 8fd52c8243f63913aaf551e4c79251dfe6241298 (patch) | |
| tree | f59a4e653bada754b0897cc1dd2dff5d9a6f9db8 /phpBB | |
| parent | af0f5128c6f3ef439b2078f82575f2bde2ecd828 (diff) | |
| parent | d20979c43ced68eba4bdb228a4c9fa408e5ff21f (diff) | |
| download | forums-8fd52c8243f63913aaf551e4c79251dfe6241298.tar forums-8fd52c8243f63913aaf551e4c79251dfe6241298.tar.gz forums-8fd52c8243f63913aaf551e4c79251dfe6241298.tar.bz2 forums-8fd52c8243f63913aaf551e4c79251dfe6241298.tar.xz forums-8fd52c8243f63913aaf551e4c79251dfe6241298.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
Diffstat (limited to 'phpBB')
| -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 597dd5e932..3e74ea8ab7 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]) { |