diff options
author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-04 13:33:42 -0600 |
---|---|---|
committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-04 13:33:42 -0600 |
commit | 941b7287b7dd3477d5ebce8d15a83cdde49e9dd7 (patch) | |
tree | c8a8873e9419a25e03f70802cac00742ae4f1fd0 /phpBB/includes/db | |
parent | 029f096411f620f2066608cd0a1e8711f88da9e1 (diff) | |
parent | 2e2ddd7e85034f747d5dd312803aadfc47ac80e2 (diff) | |
download | forums-941b7287b7dd3477d5ebce8d15a83cdde49e9dd7.tar forums-941b7287b7dd3477d5ebce8d15a83cdde49e9dd7.tar.gz forums-941b7287b7dd3477d5ebce8d15a83cdde49e9dd7.tar.bz2 forums-941b7287b7dd3477d5ebce8d15a83cdde49e9dd7.tar.xz forums-941b7287b7dd3477d5ebce8d15a83cdde49e9dd7.zip |
Merge remote-tracking branch 'remotes/marc/feature/avatars' into develop
# By Marc Alexander (100) and others
# Via Marc Alexander (8) and Igor Wiedler (3)
* remotes/marc/feature/avatars: (138 commits)
[feature/avatars] Update module_auth of ucp module and fix small issues
[feature/avatars] Add migrations data file for avatars
[feature/avatars] Reduce module auth of ucp avatar settings
[feature/avatars] Auto-clear avatar dimensions when first changing avatars
[feature/avatars] Use "Main" as category for avatars in root of gallery
[feature/avatars] Remove trailing whitespace from avatar code
[feature/avatars] Pass phpbb_user to prepare and process form functions
[feature/avatars] Document the use of the allowed extensions array
[feature/avatars] Use array for allowed extensions and implode if needed
[feature/avatars] Use deprecated for compatibility function
[feature/avatars] Correct license, copyright and package info
[feature/avatars] Move list of supported formats to avatar driver class
[feature/avatars] Add include of functions_display.php in BC function
[feature/avatars] Add note about when compatibility function was added
[feature/avatars] Add compatibility function for get_user_avatar()
[feature/avatars] Move definition of driver_collection to avatars.yml
[feature/avatars] Remove the obsolete request argument for avatar drivers
[feature/avatars] Add missing @var to docblocks in avatar manager
[feature/avatars] Remove not needed inline style
[feature/avatars] Differentiate tests for get drivers functions
...
Diffstat (limited to 'phpBB/includes/db')
-rw-r--r-- | phpBB/includes/db/migration/data/310/avatars.php | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/phpBB/includes/db/migration/data/310/avatars.php b/phpBB/includes/db/migration/data/310/avatars.php new file mode 100644 index 0000000000..79547337f7 --- /dev/null +++ b/phpBB/includes/db/migration/data/310/avatars.php @@ -0,0 +1,67 @@ +<?php +/** +* +* @package migration +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2 +* +*/ + +class phpbb_db_migration_data_310_avatars extends phpbb_db_migration +{ + public function effectively_installed() + { + return isset($this->config['allow_avatar_gravatar']); + } + + static public function depends_on() + { + return array('phpbb_db_migration_data_30x_3_0_11'); + } + + public function update_schema() + { + return array( + 'change_columns' => array( + $this->table_prefix . 'users' => array( + 'user_avatar_type' => array('VCHAR:255', ''), + ), + $this->table_prefix . 'groups' => array( + 'group_avatar_type' => array('VCHAR:255', ''), + ), + ), + ); + } + + public function revert_schema() + { + return array( + 'change_columns' => array( + $this->table_prefix . 'users' => array( + 'user_avatar_type' => array('TINT:2', ''), + ), + $this->table_prefix . 'groups' => array( + 'group_avatar_type' => array('TINT:2', ''), + ), + ), + ); + } + + public function update_data() + { + return array( + array('config.add', array('allow_avatar_gravatar', 0)), + array('custom', array(array($this, 'update_module_auth'))), + ); + } + + public function update_module_auth() + { + $sql = 'UPDATE ' . $this->table_prefix . "modules + SET module_auth = 'cfg_allow_avatar' + WHERE module_class = 'ucp' + AND module_basename = 'ucp_profile' + AND module_mode = 'avatar'"; + $this->db->sql_query($sql); + } +} |