diff options
| -rw-r--r-- | phpBB/admin/admin_board.php | 2 | ||||
| -rw-r--r-- | phpBB/admin/admin_mass_email.php | 2 | ||||
| -rw-r--r-- | phpBB/admin/admin_users.php | 2 | ||||
| -rw-r--r-- | phpBB/common.php | 2 | ||||
| -rw-r--r-- | phpBB/config.php | 8 | ||||
| -rw-r--r-- | phpBB/includes/constants.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/posting.php | 2 | ||||
| -rw-r--r-- | phpBB/privmsg.php | 2 | ||||
| -rw-r--r-- | phpBB/profile.php | 2 | ||||
| -rw-r--r-- | phpBB/search.php | 2 | ||||
| -rw-r--r-- | phpBB/templates/PSO/admin/forum_delete_body.tpl | 4 |
12 files changed, 15 insertions, 17 deletions
diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php index 11eed1fb2b..a981de6c1a 100644 --- a/phpBB/admin/admin_board.php +++ b/phpBB/admin/admin_board.php @@ -143,4 +143,4 @@ $template->pparse("body"); include('page_footer_admin.'.$phpEx); -?> +?>
\ No newline at end of file diff --git a/phpBB/admin/admin_mass_email.php b/phpBB/admin/admin_mass_email.php index 9d62cdc169..38d5cfd101 100644 --- a/phpBB/admin/admin_mass_email.php +++ b/phpBB/admin/admin_mass_email.php @@ -146,4 +146,4 @@ $template->assign_vars(array( $template->pparse('body'); include('page_footer_admin.'.$phpEx); -?> +?>
\ No newline at end of file diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php index d476dc802d..0dbdd59208 100644 --- a/phpBB/admin/admin_users.php +++ b/phpBB/admin/admin_users.php @@ -469,4 +469,4 @@ else include('page_footer_admin.'.$phpEx); -?> +?>
\ No newline at end of file diff --git a/phpBB/common.php b/phpBB/common.php index 8e585b57e2..ca9e5ad0c7 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -209,4 +209,4 @@ if($board_config['board_disable'] && !defined("IN_ADMIN")) // $emailer = new emailer($board_config['smtp_delivery']); -?> +?>
\ No newline at end of file diff --git a/phpBB/config.php b/phpBB/config.php index fc480fb9d3..d04e4b5260 100644 --- a/phpBB/config.php +++ b/phpBB/config.php @@ -31,9 +31,9 @@ // MySQL // $dbms = "mysql"; -$dbhost = ""; -$dbname = ""; -$dbuser = ""; +$dbhost = "localhost"; +$dbname = "phpbb2"; +$dbuser = "root"; $dbpasswd = ""; */ @@ -97,4 +97,4 @@ $dbpasswd = ""; // $table_prefix = "phpbb_"; -?> +?>
\ No newline at end of file diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index af19e9dbd0..00cc6e2eb9 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -164,4 +164,4 @@ define('VOTE_DESC_TABLE', $table_prefix.'vote_desc'); define('VOTE_RESULTS_TABLE', $table_prefix.'vote_results'); define('VOTE_USERS_TABLE', $table_prefix.'vote_voters'); -?> +?>
\ No newline at end of file diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index bcde9d7dcb..34eedaf9bf 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -942,4 +942,4 @@ function obtain_word_list(&$orig_word, &$replacement_word) return(TRUE); } -?> +?>
\ No newline at end of file diff --git a/phpBB/posting.php b/phpBB/posting.php index 9c62c89d3c..60501aeeae 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -2099,4 +2099,4 @@ $template->pparse("body"); include($phpbb_root_path . 'includes/page_tail.'.$phpEx); -?> +?>
\ No newline at end of file diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index 058945d4e9..ba0a362301 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -1298,4 +1298,4 @@ $template->pparse("body"); include($phpbb_root_path . 'includes/page_tail.'.$phpEx); -?> +?>
\ No newline at end of file diff --git a/phpBB/profile.php b/phpBB/profile.php index 167855461a..c2c9bf8d9b 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -1071,4 +1071,4 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) } } -?> +?>
\ No newline at end of file diff --git a/phpBB/search.php b/phpBB/search.php index 15deca983b..9a271a6647 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -555,4 +555,4 @@ $template->pparse("body"); include($phpbb_root_path . 'includes/page_tail.'.$phpEx); -?> +?>
\ No newline at end of file diff --git a/phpBB/templates/PSO/admin/forum_delete_body.tpl b/phpBB/templates/PSO/admin/forum_delete_body.tpl index 783e8b3aa0..159b1880fa 100644 --- a/phpBB/templates/PSO/admin/forum_delete_body.tpl +++ b/phpBB/templates/PSO/admin/forum_delete_body.tpl @@ -19,9 +19,7 @@ <tr> <td class="row1">Move everything to:</td> <td class="row2"> - <select name="to_id"> - {S_TO_IDS} - </select> + {S_SELECT_TO} </td> </tr> <tr> |