diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-06-10 13:42:55 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-06-10 13:42:55 +0000 |
| commit | afb7f26cccf999cc4a4a1fddf25ed24b585b45e0 (patch) | |
| tree | dfa6945a59ac80020feee974970c0c0008c129d3 /phpBB/install | |
| parent | de739b6532f16cc187a3ef492343807229f7b3c4 (diff) | |
| download | forums-afb7f26cccf999cc4a4a1fddf25ed24b585b45e0.tar forums-afb7f26cccf999cc4a4a1fddf25ed24b585b45e0.tar.gz forums-afb7f26cccf999cc4a4a1fddf25ed24b585b45e0.tar.bz2 forums-afb7f26cccf999cc4a4a1fddf25ed24b585b45e0.tar.xz forums-afb7f26cccf999cc4a4a1fddf25ed24b585b45e0.zip | |
#12287
#12219
A little clean-up in the installer (thanks ToonArmy)
git-svn-id: file:///svn/phpbb/trunk@7744 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 8 | ||||
| -rw-r--r-- | phpBB/install/install_convert.php | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 5585a8075f..64e4c5726e 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -184,8 +184,14 @@ if (!$get_info) 'extensions', 'extension_groups' ); + + $src_db->sql_freeresult($result); } - $src_db->sql_freeresult($result); + elseif ($result) + { + $src_db->sql_freeresult($result); + } + /** * Tests for further MODs can be included here. diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index c5a6df33b6..455f8841ad 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -1247,7 +1247,6 @@ class install_convert extends module if (!$convert_row) { // move to the next batch or table - $src_db->sql_freeresult($___result); break; } |