diff options
| author | Jim Wigginton <terrafrost@phpbb.com> | 2009-08-22 02:56:05 +0000 |
|---|---|---|
| committer | Jim Wigginton <terrafrost@phpbb.com> | 2009-08-22 02:56:05 +0000 |
| commit | 70c4e48b3973df360ec075b89011cb2841c1abb7 (patch) | |
| tree | 5288b94fe8768600c569139a3802cef19a456f82 /phpBB/includes/functions_admin.php | |
| parent | 69aa05376bd6cd04e23b6edcfe0d44e9e5f5f7e2 (diff) | |
| download | forums-70c4e48b3973df360ec075b89011cb2841c1abb7.tar forums-70c4e48b3973df360ec075b89011cb2841c1abb7.tar.gz forums-70c4e48b3973df360ec075b89011cb2841c1abb7.tar.bz2 forums-70c4e48b3973df360ec075b89011cb2841c1abb7.tar.xz forums-70c4e48b3973df360ec075b89011cb2841c1abb7.zip | |
- accidentally undid changes introduced in r9979
- removed a few lines from the old log filtering system
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10042 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index d84216701a..a021717f57 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -338,12 +338,13 @@ function copy_forum_permissions($src_forum_id, $dest_forum_ids, $clear_dest_perm return false; } - // Check if source forums exists + // Check if source forum exists $sql = 'SELECT forum_name FROM ' . FORUMS_TABLE . ' WHERE forum_id = ' . $src_forum_id; $result = $db->sql_query($sql); $src_forum_name = $db->sql_fetchfield('forum_name'); + $db->sql_freeresult($result); // Source forum doesn't exist if (empty($src_forum_name)) @@ -357,6 +358,7 @@ function copy_forum_permissions($src_forum_id, $dest_forum_ids, $clear_dest_perm WHERE ' . $db->sql_in_set('forum_id', $dest_forum_ids); $result = $db->sql_query($sql); + $dest_forum_ids = $dest_forum_names = array(); while ($row = $db->sql_fetchrow($result)) { $dest_forum_ids[] = (int) $row['forum_id']; |