Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x

1 files changed, 2 insertions, 2 deletions

diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 68c6ce701..0f8122c07 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -75,7 +75,7 @@ class AvatarsettingsAction extends AccountSettingsAction
 
     function getInstructions()
     {
-        return _('You can upload your personal avatar.');
+        return _('You can upload your personal avatar. The maximum file size is '.ImageFile::maxFileSize().'.');
     }
 
     /**
@@ -155,7 +155,7 @@ class AvatarsettingsAction extends AccountSettingsAction
         $this->element('input', array('name' => 'MAX_FILE_SIZE',
                                       'type' => 'hidden',
                                       'id' => 'MAX_FILE_SIZE',
-                                      'value' => MAX_AVATAR_SIZE));
+                                      'value' => ImageFile::maxFileSize(true)));
         $this->elementEnd('li');
         $this->elementEnd('ul');