From 8d4ddc3b236a194b7f31e631e77366cd4f4adfd0 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 13 Jun 2009 14:55:30 +0000 Subject: [PATCH] erm, we need to check if the feed module is already there git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9584 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/database_update.php | 38 ++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 992db93452..948087dd3b 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1070,18 +1070,34 @@ function change_database_data(&$no_updates, $version) if ($category_id) { - $module_data = array( - 'module_basename' => 'board', - 'module_enabled' => 1, - 'module_display' => 1, - 'parent_id' => $category_id, - 'module_class' => 'acp', - 'module_langname' => 'ACP_FEED_SETTINGS', - 'module_mode' => 'feed', - 'module_auth' => 'acl_a_board', - ); + // Check if we actually need to add the feed module or if it is already added. ;) + $sql = 'SELECT * + FROM ' . MODULES_TABLE . " + WHERE module_basename = 'board' + AND module_class = 'acp' + AND module_langname = 'ACP_FEED_SETTINGS' + AND module_mode = 'feed' + AND module_auth = 'acl_a_board' + AND parent_id = {$category_id}"; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); - $_module->update_module_data($module_data, true); + if (!$row) + { + $module_data = array( + 'module_basename' => 'board', + 'module_enabled' => 1, + 'module_display' => 1, + 'parent_id' => $category_id, + 'module_class' => 'acp', + 'module_langname' => 'ACP_FEED_SETTINGS', + 'module_mode' => 'feed', + 'module_auth' => 'acl_a_board', + ); + + $_module->update_module_data($module_data, true); + } } $_module->remove_cache_file();