mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-17 15:11:40 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'bantu/ticket/11524' into prep-release-3.0.12

Browse Source 
* bantu/ticket/11524:
  [ticket/11524] Add another isset() to mitigate "Illegal string offset 'limit'"
This commit is contained in:
Joas Schilling
2013-07-30 11:23:55 +02:00
parent 6ab4c9a702 8a6f3a5800
commit ddea90c802
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/develop/mysql_upgrader.php
View File

@@ -149,7 +149,8 @@ foreach ($schema_data as $table_name => $table_data)
list($orig_column_type, $column_length) = explode(':', $column_data[0]); list($orig_column_type, $column_length) = explode(':', $column_data[0]);
$column_type = sprintf($dbms_type_map['mysql_41'][$orig_column_type . ':'], $column_length); $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]) switch ($dbms_type_map['mysql_40'][$orig_column_type . ':']['limit'][0])
{ {