aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-09-28 15:04:59 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-09-28 15:04:59 +0000
commit26befa094147b542e48e36867eb41eaf424225f7 (patch)
tree5131952196ff19744498bbbdc962635cecc94c4f /phpBB/install
parent67accdb07263030c29eebba9edf944fd350879d1 (diff)
downloadforums-26befa094147b542e48e36867eb41eaf424225f7.tar
forums-26befa094147b542e48e36867eb41eaf424225f7.tar.gz
forums-26befa094147b542e48e36867eb41eaf424225f7.tar.bz2
forums-26befa094147b542e48e36867eb41eaf424225f7.tar.xz
forums-26befa094147b542e48e36867eb41eaf424225f7.zip
- added confirmation to removing bbcodes
- added optional MX and DNSBL checks - added backtrace (triggering sql error) on error within sql_in_set as well as making sure it is handling an array - let users having f_list access to a forum actually see the forum without a topic list and not displaying an error message - this allows for giving people access to subforums but not the parent forum without the need to add the (sub-)forum to the index. - some additional bugfixes git-svn-id: file:///svn/phpbb/trunk@6414 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
-rwxr-xr-xphpBB/install/index.php4
-rw-r--r--phpBB/install/schemas/schema_data.sql2
2 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index ee8ec90fdf..4236725308 100755
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -344,7 +344,7 @@ class module
$template->display('body');
// Close our DB connection.
- if (isset($db))
+ if (!empty($db) && is_object($db))
{
$db->sql_close();
}
@@ -533,7 +533,7 @@ class module
echo '</body>';
echo '</html>';
- if (isset($db))
+ if (!empty($db) && is_object($db))
{
$db->sql_close();
}
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 115772a11c..1748c88d12 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -59,6 +59,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('browser_check', '1
INSERT INTO phpbb_config (config_name, config_value) VALUES ('bump_interval', '10');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('bump_type', 'd');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('cache_gc', '7200');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('check_dnsbl', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('chg_passforce', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_domain', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name', 'phpbb3');
@@ -73,6 +74,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style', '1
INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_last_edited', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_order', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('edit_time', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_check_mx', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_enable', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_function_name', 'mail');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_package_size', '50');