diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-03-12 14:48:07 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-03-12 14:48:07 -0500 |
| commit | d4ee7718b9505dc6e9b3889a6a3218714c7b8e5a (patch) | |
| tree | 43e0df29273f6e699810cf0d3906224226960009 /phpBB | |
| parent | 739dbd9e31388f45648e259243bd02306acf285f (diff) | |
| parent | 4ad8fcbd58aeb72b659db6ebc18ff38b0725f006 (diff) | |
| download | forums-d4ee7718b9505dc6e9b3889a6a3218714c7b8e5a.tar forums-d4ee7718b9505dc6e9b3889a6a3218714c7b8e5a.tar.gz forums-d4ee7718b9505dc6e9b3889a6a3218714c7b8e5a.tar.bz2 forums-d4ee7718b9505dc6e9b3889a6a3218714c7b8e5a.tar.xz forums-d4ee7718b9505dc6e9b3889a6a3218714c7b8e5a.zip | |
Merge remote-tracking branch 'remotes/Marc/ticket/11404' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11404:
[ticket/11404] Remove version ID from manager_test.php file header
[ticket/11404] Add tests for phpbb_avatar_manager::clean_row()
[ticket/11404] Convert manager_test to UNIX line endings
[ticket/11404] Use a default data row if $row is empty in clean_row()
[ticket/11404] Return empty array of avatar data if $row is empty
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/avatar/manager.php | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php index 9c60436de8..58d994c3c0 100644 --- a/phpBB/includes/avatar/manager.php +++ b/phpBB/includes/avatar/manager.php @@ -46,6 +46,17 @@ class phpbb_avatar_manager protected $container; /** + * Default avatar data row + * @var array + */ + static protected $default_row = array( + 'avatar' => '', + 'avatar_type' => '', + 'avatar_width' => '', + 'avatar_height' => '', + ); + + /** * Construct an avatar manager object * * @param phpbb_config $config phpBB configuration @@ -174,6 +185,12 @@ class phpbb_avatar_manager */ static public function clean_row($row) { + // Upon creation of a user/group $row might be empty + if (empty($row)) + { + return self::$default_row; + } + $keys = array_keys($row); $values = array_values($row); |