aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/database_update.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-09-20 21:26:37 +0200
committerNils Adermann <naderman@naderman.de>2011-09-20 21:26:37 +0200
commit4e8e31c10b11972a073a79fbbd7865a1195ef456 (patch)
treeca0578de1e67d065004f770d3881b37482c8bae9 /phpBB/install/database_update.php
parentf31d32dd89e5d01e08f0ae09b43042377bfdfc0c (diff)
parent3e76f7468864f5e5d8c3f805745c44e422ae817c (diff)
downloadforums-4e8e31c10b11972a073a79fbbd7865a1195ef456.tar
forums-4e8e31c10b11972a073a79fbbd7865a1195ef456.tar.gz
forums-4e8e31c10b11972a073a79fbbd7865a1195ef456.tar.bz2
forums-4e8e31c10b11972a073a79fbbd7865a1195ef456.tar.xz
forums-4e8e31c10b11972a073a79fbbd7865a1195ef456.zip
Merge remote-tracking branch 'github-cyberalien/feature/remove-imagesets' into develop
* github-cyberalien/feature/remove-imagesets: [feature/remove-imagesets] Script for converting imageset to css [feature/remove-imagesets] Changing subsilver [feature/remove-imagesets] Changing prosilver [feature/remove-imagesets] Adjustments to php files [feature/remove-imagesets] Changing admin control panel styles module [feature/remove-imagesets] Changing database structure [feature/remove-imagesets] Removing imageset files [feature/remove-imagesets] Moving images
Diffstat (limited to 'phpBB/install/database_update.php')
-rw-r--r--phpBB/install/database_update.php13
1 files changed, 13 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index b69d44d7be..7f542974d9 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1061,6 +1061,15 @@ function database_update_info()
'group_legend' => array('UINT', 0),
),
),
+ 'drop_columns' => array(
+ STYLES_TABLE => array(
+ 'imageset_id',
+ ),
+ ),
+ 'drop_tables' => array(
+ STYLES_IMAGESET_TABLE,
+ STYLES_IMAGESET_DATA_TABLE,
+ ),
),
);
}
@@ -2128,6 +2137,10 @@ function change_database_data(&$no_updates, $version)
);
_add_modules($modules_to_install);
+
+ $sql = 'DELETE FROM ' . MODULES_TABLE . "
+ WHERE module_basename = 'styles' AND module_mode = 'imageset'";
+ _sql($sql, $errored, $error_ary);
// 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