diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-02-23 19:07:25 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-02-23 19:07:25 +0000 |
| commit | d3459b3f493ddd06b51f345897dc99368a328326 (patch) | |
| tree | 96656bc10a1758a26d1d134f02d25114736bcdf1 | |
| parent | 63e07777cd9a5d7ef68693fa7c9098e46493965c (diff) | |
| download | forums-d3459b3f493ddd06b51f345897dc99368a328326.tar forums-d3459b3f493ddd06b51f345897dc99368a328326.tar.gz forums-d3459b3f493ddd06b51f345897dc99368a328326.tar.bz2 forums-d3459b3f493ddd06b51f345897dc99368a328326.tar.xz forums-d3459b3f493ddd06b51f345897dc99368a328326.zip | |
Merge r10526 into 3.0.7 branch.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10527 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_admin.php | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 6df74acc9e..aef5d601d0 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -163,6 +163,7 @@ <li>[Fix] Global announcements could not be accessed on a board using Firebird as the database server. (Bug #57525)</li> <li>[Fix] BBCode parser now uses the user object for all settings rather than taking some from the template object (Bug #57365)</li> <li>[Fix] Ensure a database connection is available before logging general errors. (Bug #57975)</li> + <li>[Fix] Do not delete unrelated attachments when deleting empty forums. (Bug #57375)</li> <li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li> <li>[Change] Log activation through inactive users ACP. (Bug #30145)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index ff291fbe8a..41999bdbb0 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -913,7 +913,13 @@ function delete_attachments($mode, $ids, $resync = true) { global $db, $config; - if (is_array($ids) && sizeof($ids)) + // 0 is as bad as an empty array + if (empty($ids)) + { + return false; + } + + if (is_array($ids)) { $ids = array_unique($ids); $ids = array_map('intval', $ids); @@ -923,11 +929,6 @@ function delete_attachments($mode, $ids, $resync = true) $ids = array((int) $ids); } - if (!sizeof($ids)) - { - return false; - } - $sql_where = ''; switch ($mode) |