diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-10-29 15:16:59 -0400 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-10-29 15:16:59 -0400 |
| commit | c9ad0c6f25ddee3d433ec50b587c0a6668d4a174 (patch) | |
| tree | 54a96819d436a549ed3ea61dec4f6ab2669a2bb5 /phpBB/install/database_update.php | |
| parent | dc8052b5c035f5eb588084e68ece7e0f977290a4 (diff) | |
| parent | 88b100d818940340e660c9f372526b1b5466bf3a (diff) | |
| download | forums-c9ad0c6f25ddee3d433ec50b587c0a6668d4a174.tar forums-c9ad0c6f25ddee3d433ec50b587c0a6668d4a174.tar.gz forums-c9ad0c6f25ddee3d433ec50b587c0a6668d4a174.tar.bz2 forums-c9ad0c6f25ddee3d433ec50b587c0a6668d4a174.tar.xz forums-c9ad0c6f25ddee3d433ec50b587c0a6668d4a174.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11158] Require acl_u_sig for ucp signature module.
[ticket/11158] Revert old fix in PHPBB3-10186.
Conflicts:
phpBB/install/database_update.php
phpBB/ucp.php
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 542685a69d..1a8269220d 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1101,6 +1101,8 @@ function database_update_info() ), // No changes from 3.0.11-RC2 to 3.0.11 '3.0.11-RC2' => array(), + // No changes from 3.0.11 to 3.0.12-RC1 + '3.0.11' => array(), /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */ @@ -2248,6 +2250,16 @@ function change_database_data(&$no_updates, $version) case '3.0.11-RC2': break; + // Changes from 3.0.11 to 3.0.12-RC1 + case '3.0.11': + $sql = 'UPDATE ' . MODULES_TABLE . ' + SET module_auth = \'acl_u_sig\' + WHERE module_class = \'ucp\' + AND module_basename = \'profile\' + AND module_mode = \'signature\''; + _sql($sql, $errored, $error_ary); + break; + // Changes from 3.1.0-dev to 3.1.0-A1 case '3.1.0-dev': |