aboutsummaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-11-05 07:56:12 -0400
committerCash Costello <cash.costello@gmail.com>2011-11-05 07:56:12 -0400
commit9afd9bfd044743d5907464b79c5904ced06cf21b (patch)
treed1051869300890768270620e673aecb238598677 /actions
parentea2613a7419fec1c2d4067aab6ac073b7b801462 (diff)
downloadelgg-9afd9bfd044743d5907464b79c5904ced06cf21b.tar.gz
elgg-9afd9bfd044743d5907464b79c5904ced06cf21b.tar.bz2
Refs #4011 forgot upload action
Diffstat (limited to 'actions')
-rw-r--r--actions/avatar/upload.php10
1 files changed, 1 insertions, 9 deletions
diff --git a/actions/avatar/upload.php b/actions/avatar/upload.php
index 885a16557..2e8ff98b3 100644
--- a/actions/avatar/upload.php
+++ b/actions/avatar/upload.php
@@ -16,15 +16,7 @@ if ($_FILES['avatar']['error'] != 0) {
forward(REFERER);
}
-//@todo make this configurable?
-$icon_sizes = array(
- 'topbar' => array('w'=>16, 'h'=>16, 'square'=>TRUE, 'upscale'=>TRUE),
- 'tiny' => array('w'=>25, 'h'=>25, 'square'=>TRUE, 'upscale'=>TRUE),
- 'small' => array('w'=>40, 'h'=>40, 'square'=>TRUE, 'upscale'=>TRUE),
- 'medium' => array('w'=>100, 'h'=>100, 'square'=>TRUE, 'upscale'=>TRUE),
- 'large' => array('w'=>200, 'h'=>200, 'square'=>FALSE, 'upscale'=>TRUE),
- 'master' => array('w'=>550, 'h'=>550, 'square'=>FALSE, 'upscale'=>FALSE)
-);
+$icon_sizes = elgg_get_config('icon_sizes');
// get the images and save their file handlers into an array
// so we can do clean up if one fails.