diff options
author | Andreas Fischer <bantu@phpbb.com> | 2013-05-06 22:11:33 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2013-05-06 22:11:33 +0200 |
commit | a97d9d4b899c424530e53d813c71eee192262e40 (patch) | |
tree | fa692d5bba3e49c60607b6a578aba5cd92649687 /phpBB/includes/functions_download.php | |
parent | 01eded7cc2b206cce593a389f09259c25e5107ff (diff) | |
parent | 841f1e492204b67443f9595e2ecdb571e74aabe9 (diff) | |
download | forums-a97d9d4b899c424530e53d813c71eee192262e40.tar forums-a97d9d4b899c424530e53d813c71eee192262e40.tar.gz forums-a97d9d4b899c424530e53d813c71eee192262e40.tar.bz2 forums-a97d9d4b899c424530e53d813c71eee192262e40.tar.xz forums-a97d9d4b899c424530e53d813c71eee192262e40.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11144] Add missing {FORUM_NAME} variable
[ticket/11144] Add missing {FORUM_NAME} variable
Conflicts:
phpBB/download/file.php
phpBB/styles/prosilver/template/login_forum.html
Diffstat (limited to 'phpBB/includes/functions_download.php')
-rw-r--r-- | phpBB/includes/functions_download.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php index 9ae647d806..ee4e2f5135 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -625,7 +625,7 @@ function phpbb_increment_downloads($db, $ids) */ function phpbb_download_handle_forum_auth($db, $auth, $topic_id) { - $sql = 'SELECT t.forum_id, f.forum_password, f.parent_id + $sql = 'SELECT t.forum_id, f.forum_name, f.forum_password, f.parent_id FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f WHERE t.topic_id = " . (int) $topic_id . " AND t.forum_id = f.forum_id"; |