aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-06-13 14:55:30 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-06-13 14:55:30 +0000
commit8d4ddc3b236a194b7f31e631e77366cd4f4adfd0 (patch)
treec18cbd52324461b3c0b2345e87a17b50f60a552f
parentd843dbd046fa427d00d30ef06558043e46c6fc98 (diff)
downloadforums-8d4ddc3b236a194b7f31e631e77366cd4f4adfd0.tar
forums-8d4ddc3b236a194b7f31e631e77366cd4f4adfd0.tar.gz
forums-8d4ddc3b236a194b7f31e631e77366cd4f4adfd0.tar.bz2
forums-8d4ddc3b236a194b7f31e631e77366cd4f4adfd0.tar.xz
forums-8d4ddc3b236a194b7f31e631e77366cd4f4adfd0.zip
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
-rw-r--r--phpBB/install/database_update.php38
1 files 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);
+
+ 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->update_module_data($module_data, true);
+ }
}
$_module->remove_cache_file();