diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-29 20:40:06 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-29 20:40:06 +0200 |
| commit | 417a0d0ea62c29ad616e75bcbf132a9017c9cfd2 (patch) | |
| tree | 32132483f24f6aaf760794b3a4d3b5723351fadf /phpBB/install | |
| parent | 40351fae96de34312ca960abc5048c835f50e3ef (diff) | |
| parent | 89391dec089e8085f486b768ad7654f62166f4a2 (diff) | |
| download | forums-417a0d0ea62c29ad616e75bcbf132a9017c9cfd2.tar forums-417a0d0ea62c29ad616e75bcbf132a9017c9cfd2.tar.gz forums-417a0d0ea62c29ad616e75bcbf132a9017c9cfd2.tar.bz2 forums-417a0d0ea62c29ad616e75bcbf132a9017c9cfd2.tar.xz forums-417a0d0ea62c29ad616e75bcbf132a9017c9cfd2.zip | |
Merge pull request #2366 from bantu/ticket/12458
[ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code
* bantu/ticket/12458:
[ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 2 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 29e5f7ab09..f3b8c82131 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -71,7 +71,6 @@ function phpbb_insert_forums() $prune_enabled = (int) $src_db->sql_fetchfield('config_value'); $src_db->sql_freeresult($result); - // Insert categories $sql = 'SELECT cat_id, cat_title FROM ' . $convert->src_table_prefix . 'categories @@ -571,7 +570,6 @@ function phpbb_convert_authentication($mode) // What we will do is handling all 2.0.x admins as founder to replicate what is common in 2.0.x. // After conversion the main admin need to make sure he is removing permissions and the founder status if wanted. - // Grab user ids of users with user_level of ADMIN $sql = "SELECT user_id FROM {$convert->src_table_prefix}users diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index dcf2756850..b345808df7 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -217,7 +217,6 @@ class install_install extends module 'S_LEGEND' => false, )); - // Check for getimagesize if (@function_exists('getimagesize')) { @@ -535,7 +534,6 @@ class install_install extends module $url = (!in_array(false, $passed)) ? $this->p_master->module_url . "?mode=$mode&sub=database&language=$language" : $this->p_master->module_url . "?mode=$mode&sub=requirements&language=$language "; $submit = (!in_array(false, $passed)) ? $lang['INSTALL_START'] : $lang['INSTALL_TEST']; - $template->assign_vars(array( 'L_SUBMIT' => $submit, 'S_HIDDEN' => $s_hidden_fields, |