diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-04-08 22:04:33 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-04-08 22:04:33 +0200 |
| commit | 26e7dd98b71655c7e09be02ebd3ef84765ce27b8 (patch) | |
| tree | 8d77283a8f8127c2a3adeddb2ca6fde3fc0305a2 /phpBB/install | |
| parent | ce4eb62b14f290efce997d6a73f0a6425fff2901 (diff) | |
| parent | 156ae40d6fae2067a65a2125924e39e8dc5f35e1 (diff) | |
| download | forums-26e7dd98b71655c7e09be02ebd3ef84765ce27b8.tar forums-26e7dd98b71655c7e09be02ebd3ef84765ce27b8.tar.gz forums-26e7dd98b71655c7e09be02ebd3ef84765ce27b8.tar.bz2 forums-26e7dd98b71655c7e09be02ebd3ef84765ce27b8.tar.xz forums-26e7dd98b71655c7e09be02ebd3ef84765ce27b8.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10561] Removed extra tabs, changes made to $db->sql_query()
[ticket/10561] Changed $temp_style_id to $style_id
[ticket/10561] Added function desc for phpbb_style_is_active()
[ticket/10561] Casted $config['default_style'] to int
[ticket/10561] Reverted to phpbb_style_is_active()
[ticket/10561] Added to database_update:database_update_info()
[ticket/10561] Added section in database_update.php
[ticket/10561] Moved and renamed the funtion validate_style().
[ticket/10561] Fixed syntax error and renamed return variables.
[ticket/10561] Changes made to $db->sql_fetchrow().
[ticket/10561] Changes made to function phpbb_style_is_active().
[ticket/10561] All users can choose deactivated styles (fixed).
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index a84136388c..be39b12d12 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1063,6 +1063,8 @@ function database_update_info() '3.0.10-RC2' => array(), // No changes from 3.0.10-RC3 to 3.0.10 '3.0.10-RC3' => array(), + // No changes from 3.0.10 to 3.0.11-RC1 + '3.0.10' => array(), /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */ @@ -2147,6 +2149,32 @@ function change_database_data(&$no_updates, $version) case '3.0.10-RC3': break; + // Changes from 3.0.10 to 3.0.11-RC1 + case '3.0.10': + // Updates users having current style a deactivated one + $sql = 'SELECT style_id + FROM ' . STYLES_TABLE . ' + WHERE style_active = 0'; + $result = $db->sql_query($sql); + + $deactivated_style_ids = array(); + while ($style_id = $db->sql_fetchfield('style_id', false, $result)) + { + $deactivated_style_ids[] = (int) $style_id; + } + $db->sql_freeresult($result); + + if (!empty($deactivated_style_ids)) + { + $sql = 'UPDATE ' . USERS_TABLE . ' + SET user_style = ' . (int) $config['default_style'] .' + WHERE ' . $db->sql_in_set('user_style', $deactivated_style_ids); + _sql($sql, $errored, $error_ary); + } + + $no_updates = false; + break; + // Changes from 3.1.0-dev to 3.1.0-A1 case '3.1.0-dev': |