diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-26 16:38:33 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-26 16:38:33 +0000 |
| commit | 1b32236b1ebbf046e84a435c97c7ed6bc9edd5f9 (patch) | |
| tree | fb368f22ddc4ca85ba81b455cc05c756f533f6a1 /phpBB/install | |
| parent | fda482ce2921bdaa5c5c61a1e288461701cea6b7 (diff) | |
| download | forums-1b32236b1ebbf046e84a435c97c7ed6bc9edd5f9.tar forums-1b32236b1ebbf046e84a435c97c7ed6bc9edd5f9.tar.gz forums-1b32236b1ebbf046e84a435c97c7ed6bc9edd5f9.tar.bz2 forums-1b32236b1ebbf046e84a435c97c7ed6bc9edd5f9.tar.xz forums-1b32236b1ebbf046e84a435c97c7ed6bc9edd5f9.zip | |
hopefully not too late in the game. Checked in new jabber class (the class done by the flyspray project). It would be nice if this could be tested with more servers - jabber.org seems to work fine...
- other fixes
git-svn-id: file:///svn/phpbb/trunk@7687 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 6 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 5ba0c9f50f..fc3523a4b8 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -592,7 +592,6 @@ if (version_compare($current_version, '3.0.RC1', '<=')) AND ug.user_id = u.user_id'; $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) { $bots[] = (int)$row['user_id']; @@ -612,6 +611,11 @@ if (version_compare($current_version, '3.0.RC1', '<=')) sql_column_change($map_dbms, POSTS_TABLE, 'post_subject', array('XSTEXT_UNI', '', 'true_sort')); } + $sql = 'DELETE FROM ' . CONFIG_TABLE . " WHERE config_name = 'jab_resource'"; + _sql($sql, $errored, $error_ary); + + set_config('jab_use_ssl', '0'); + $no_updates = false; } diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 5e7d69b38e..a25703241b 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -113,7 +113,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_host', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_password', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_package_size', '20'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_port', '5222'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_resource', ''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_use_ssl', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_username', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_base_dn', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_email', ''); @@ -148,7 +148,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_login_attempts INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_name_chars', '20'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_pass_chars', '30'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_poll_options', '10'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_chars', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_chars', '60000'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_font_size', '200'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_img_height', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_img_width', '0'); |