diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-03-22 00:45:58 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-03-22 00:45:58 +0000 |
| commit | a52cff70d2dc4425763c4f60a04f909840b03c48 (patch) | |
| tree | 391f27feef23ad05c3842b44662090ac3f69e19e | |
| parent | c5a7c2669364379da692b81e617863721ec3b0b4 (diff) | |
| download | forums-a52cff70d2dc4425763c4f60a04f909840b03c48.tar forums-a52cff70d2dc4425763c4f60a04f909840b03c48.tar.gz forums-a52cff70d2dc4425763c4f60a04f909840b03c48.tar.bz2 forums-a52cff70d2dc4425763c4f60a04f909840b03c48.tar.xz forums-a52cff70d2dc4425763c4f60a04f909840b03c48.zip | |
- Bug 1144
- Bug 1199
- We can't free a result that was already free()'d!
git-svn-id: file:///svn/phpbb/trunk@5684 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/ucp/ucp_main.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index 3ee5d01eda..e65e7f1cc4 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -335,7 +335,7 @@ class ucp_main $sql = "SELECT t.* $sql_f_select $sql_t_select - FROM (" . TOPICS_TABLE . ' t, ' . TOPICS_WATCH_TABLE . " tw + FROM (" . TOPICS_WATCH_TABLE . ' tw, ' . TOPICS_TABLE . " t $sql_join ) WHERE tw.user_id = " . $user->data['user_id'] . ' AND t.topic_id = tw.topic_id @@ -432,7 +432,6 @@ class ucp_main ); } - $db->sql_freeresult($result); break; |