From 30c64f6a01e7d5706c4c0e6b429c1d200f1c3e46 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Tue, 23 Oct 2012 13:37:46 -0400
Subject: [PATCH] [ticket/11088] Untested, progress on update script

This should rename Styles category to Customise, move language packs, and add extension management

PHPBB3-11088
---
 phpBB/install/database_update.php | 49 +++++++++++++------------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 7fa853938d..610c591fcc 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -2459,19 +2459,31 @@ function change_database_data(&$no_updates, $version)
 				unset($next_legend);
 			}
 
-			// Create new Customise ACP tab
+			// Rename styles module to Customise
+			$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+				WHERE module_langname = 'ACP_STYLE_MANAGEMENT'";
+			$result = _sql($sql, $errored, $error_ary);
+			$row = $db->sql_fetchrow($result);
+			$styles_module_id = (int) $row['module_id'];
+			$db->sql_freeresult($result);
+
 			$module_manager = new acp_modules();
 			$module_manager->update_module_data(array(
-				'parent_id'         => 0,
-				'module_enabled'    => 1,
-				'module_display'    => 1,
-				'module_basename'   => '',
-				'module_class'      => 'acp',
-				'module_mode'       => '',
-				'module_auth'       => '',
+				'module_id'			=> $styles_module_id,
 				'module_langname'	=> 'ACP_CAT_CUSTOMISE',
 			));
 
+			// Move language management to Customise
+			// First select the current language managment module ID
+			$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
+				WHERE module_basename = 'language'";
+			$result = $db->sql_query($sql);
+			while($row = $db->sql_fetchrow($result))
+			{
+				$module_manager->move_module($row['module_id'], $customise_category_id);
+			}
+			$db->sql_freeresult($result);
+
 			// Install modules
 			$modules_to_install = array(
 				'position'	=> array(
@@ -2524,27 +2536,6 @@ function change_database_data(&$no_updates, $version)
 				WHERE (module_basename = 'styles' OR module_basename = 'acp_styles') AND (module_mode = 'imageset' OR module_mode = 'theme' OR module_mode = 'template')";
 			_sql($sql, $errored, $error_ary);
 
-			// Move language management to Customise
-			// First select the current language managment module ID
-			$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-				WHERE module_basename = 'language' OR module_langname = 'styles'";
-			$result = $db->sql_query($sql);
-			$modules_to_move = $db->sql_fetchrowset($result);
-			$db->sql_freeresult($result);
-
-			// Next, selec the ID of the new parent module
-			$sql = 'SELECT module_id FROM ' . MODULES_TABLE . "
-				WHERE module_langname = 'ACP_CAT_CUSTOMISE'";
-			$result = $db->sql_query($sql);
-			$customise_category_id = $db->sql_fetchfield('module_id');
-			$db->sql_freeresult($result);
-
-			// Now perform the move
-			foreach ($modules_to_move as $module_id)
-			{
-				$module_manager->move_module($module_id, $customise_category_id);
-			}
-
 			// Localise Global Announcements
 			$sql = 'SELECT topic_id, topic_approved, (topic_replies + 1) AS topic_posts, topic_last_post_id, topic_last_post_subject, topic_last_post_time, topic_last_poster_id, topic_last_poster_name, topic_last_poster_colour
 				FROM ' . TOPICS_TABLE . '