diff options
| author |   Tom Knight <tomk@gentoo.org> | 2011-07-17 14:36:00 +0000 |
|---|---|---|
| committer | Tom Knight <tomk@gentoo.org> | 2011-07-17 14:36:00 +0000 |
| commit | 295aae383e31a53daf368b752784a716d64340f1 (patch) | |
| tree | 2716ccffa0f47452d71909dbb346faea38f23c99 | |
| parent | Call date_default_timezone_set() in common.php (diff) | |
| download | forums-295aae383e31a53daf368b752784a716d64340f1.tar.gz forums-295aae383e31a53daf368b752784a716d64340f1.tar.bz2 forums-295aae383e31a53daf368b752784a716d64340f1.zip | |
Removed non-working workaround for "Could not obtain topic watch information" error
| -rw-r--r-- | docs/ChangeLog | 3 | ||||
| -rw-r--r-- | htdocs/includes/functions_post.php | 9 | ||||
| -rw-r--r-- | htdocs/includes/usercp_register.php | 9 |
3 files changed, 4 insertions, 17 deletions
diff --git a/docs/ChangeLog b/docs/ChangeLog index d793471e6..8b1f288e1 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,6 +1,7 @@ -- workaround for 'Could not obtain topic watch information' error (tomk/desultory/robbat2) - explicitly set default timezone, used for log message timestamps (desultory) +------------------------------------------------------------------------------- + phpBB-2-0-23-gentoo-p5 (2011-02-20) - Show hostname on ACP 'Make Includes' page (tomk) - Bugfix CIDR IP ban session dropping (desultory) diff --git a/htdocs/includes/functions_post.php b/htdocs/includes/functions_post.php index 40af1388f..46014ef59 100644 --- a/htdocs/includes/functions_post.php +++ b/htdocs/includes/functions_post.php @@ -6,7 +6,7 @@ * copyright : (C) 2001 The phpBB Group * email : support@phpbb.com * - * $Id: functions_post.php,v 1.19 2006/10/30 22:46:13 maedhros Exp $ + * $Id: functions_post.php,v 1.20 2011/06/23 10:33:45 tomk Exp $ * * ***************************************************************************/ @@ -740,13 +740,6 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi } } } - // 2011-06-23 tomk - workaround for "Could not obtain topic watch information" error - // the mail code seems to be taking too long causing the connection timeout to kick in so reconnect to DB - include($phpbb_root_path . 'config.'.$phpEx); - include($phpbb_root_path . 'includes/db.'.$phpEx); - // no longer needed - unset($dbpasswd); - $db->sql_freeresult($result); if ($update_watched_sql != '') diff --git a/htdocs/includes/usercp_register.php b/htdocs/includes/usercp_register.php index 52ff4c2f3..15ddf658e 100644 --- a/htdocs/includes/usercp_register.php +++ b/htdocs/includes/usercp_register.php @@ -6,7 +6,7 @@ * copyright : (C) 2001 The phpBB Group * email : support@phpbb.com * - * $Id: usercp_register.php,v 1.38 2011/02/20 12:58:50 tomk Exp $ + * $Id: usercp_register.php,v 1.39 2011/06/23 10:33:45 tomk Exp $ * * ***************************************************************************/ @@ -791,13 +791,6 @@ if ( isset($HTTP_POST_VARS['submit']) ) $emailer->send(); $emailer->reset(); - // 2011-06-23 tomk - workaround for "Could not obtain topic watch information" error - // the mail code seems to be taking too long causing the connection timeout to kick in so reconnect to DB - include($phpbb_root_path . 'config.'.$phpEx); - include($phpbb_root_path . 'includes/db.'.$phpEx); - // no longer needed - unset($dbpasswd); - // update last_spammer_email $sql = "UPDATE " . CONFIG_TABLE . " SET config_value = " . $now . " |