diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-30 11:25:32 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-30 11:25:32 +0200 |
| commit | d20979c43ced68eba4bdb228a4c9fa408e5ff21f (patch) | |
| tree | 4568548923a71bab2fb570a0ecdd8b1797d6dad0 | |
| parent | ef1f3f17ce49f52211bd3f2dc2b6e61b8d58397d (diff) | |
| parent | ddea90c80230a1a2875d24ba750b71355536df95 (diff) | |
| download | forums-d20979c43ced68eba4bdb228a4c9fa408e5ff21f.tar forums-d20979c43ced68eba4bdb228a4c9fa408e5ff21f.tar.gz forums-d20979c43ced68eba4bdb228a4c9fa408e5ff21f.tar.bz2 forums-d20979c43ced68eba4bdb228a4c9fa408e5ff21f.tar.xz forums-d20979c43ced68eba4bdb228a4c9fa408e5ff21f.zip | |
Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
[ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
| -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]) { |