aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_admin.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-09-02 13:33:06 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-09-02 13:33:06 +0000
commit3ea2d53cb2b2554e944beb96fb98ea5c4c3aa23e (patch)
tree99adb7132f8294497e6deb2615801229b2a061c3 /phpBB/includes/functions_admin.php
parentcf7a2614088ad7a17de201abfc6e8a93d4cea5d7 (diff)
downloadforums-3ea2d53cb2b2554e944beb96fb98ea5c4c3aa23e.tar
forums-3ea2d53cb2b2554e944beb96fb98ea5c4c3aa23e.tar.gz
forums-3ea2d53cb2b2554e944beb96fb98ea5c4c3aa23e.tar.bz2
forums-3ea2d53cb2b2554e944beb96fb98ea5c4c3aa23e.tar.xz
forums-3ea2d53cb2b2554e944beb96fb98ea5c4c3aa23e.zip
some changes/fixes
git-svn-id: file:///svn/phpbb/trunk@6345 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_admin.php')
-rw-r--r--phpBB/includes/functions_admin.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index bb889eae12..822d17367c 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -511,7 +511,7 @@ function delete_topics($where_type, $where_ids, $auto_sync = true)
$forum_ids[] = $row['forum_id'];
$topic_ids[] = $row['topic_id'];
}
- $db->sql_freeresult();
+ $db->sql_freeresult($result);
$return['topics'] = sizeof($topic_ids);
@@ -628,7 +628,7 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
trigger_error('NO_SUCH_SEARCH_MODULE');
}
- require("{$phpbb_root_path}includes/search/$search_type.$phpEx");
+ include_once("{$phpbb_root_path}includes/search/$search_type.$phpEx");
$error = false;
$search = new $search_type($error);
@@ -1142,7 +1142,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
{
$topic_ids[] = $row['topic_id'];
}
- $db->sql_freeresult();
+ $db->sql_freeresult($result);
if (!sizeof($topic_ids))
{
@@ -1728,7 +1728,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
foreach ($fieldnames as $fieldname)
{
- if ($row['topic_' . $fieldname] != $row[$fieldname])
+ if (isset($row[$fieldname]) && isset($row['topic_' . $fieldname]) && $row['topic_' . $fieldname] != $row[$fieldname])
{
$sql_ary['topic_' . $fieldname] = $row[$fieldname];
}