diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-04-08 23:03:17 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-04-08 23:03:17 +0200 |
| commit | 9165a045c5dee06bb5c163281bb817369a1733a3 (patch) | |
| tree | 7e27a3e6720eb9943e0d344d92dc443cd5be77a9 /phpBB/install | |
| parent | e78fbfef9c6aac1349d18454a4292781d661795c (diff) | |
| parent | 26e7dd98b71655c7e09be02ebd3ef84765ce27b8 (diff) | |
| download | forums-9165a045c5dee06bb5c163281bb817369a1733a3.tar forums-9165a045c5dee06bb5c163281bb817369a1733a3.tar.gz forums-9165a045c5dee06bb5c163281bb817369a1733a3.tar.bz2 forums-9165a045c5dee06bb5c163281bb817369a1733a3.tar.xz forums-9165a045c5dee06bb5c163281bb817369a1733a3.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/dic
* upstream/develop: (76 commits)
[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/10764] FAQ now mentions Area51 instead of SourceForge
[ticket/10764] FAQ now mentions GitHub instead of SourceForge
[ticket/10455] Removed NOTE from prosilver overall_header.html.
[ticket/10561] Moved and renamed the funtion validate_style().
[ticket/10575] Adding public visibility to the methods.
[ticket/10575] Fixing non-static access to static functions get_instance
[ticket/10547] User is not logged in as admin after installation
[ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
[ticket/10650] Added checking for empty subjects
[ticket/10650] Corrected intendation
[ticket/10650]Added permission checking and utf8 functions
[ticket/10650] Cropped subject and inserted newline
[ticket/10650] Corrected space before true
...
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 28 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 3 |
2 files changed, 31 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': diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 361376763d..7558fde944 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1804,6 +1804,9 @@ class install_install extends module $this->page_title = $lang['STAGE_FINAL']; + // Obtain any submitted data + $data = $this->get_submitted_data(); + // We need to fill the config to let internal functions correctly work $config = new phpbb_config_db($db, new phpbb_cache_driver_null, CONFIG_TABLE); set_config(null, null, null, $config); |