Fix so displayed maximum attachment size depends also on 'max_message_size' (#7105)

1 files changed, 3 insertions, 2 deletions

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index e61b12f7e..535da2e09 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -2160,13 +2160,14 @@ class rcmail extends rcube
      * @param string $name       Form object name
      * @param string $action     Form action name
      * @param array  $input_attr File input attributes
+     * @param int    $max_size   Maximum upload size
      *
      * @return string HTML output
      */
-    public function upload_form($attrib, $name, $action, $input_attr = array())
+    public function upload_form($attrib, $name, $action, $input_attr = array(), $max_size = null)
     {
         // Get filesize, enable upload progress bar
-        $max_filesize = $this->upload_init();
+        $max_filesize = $this->upload_init($max_size);
 
         $hint = html::div('hint', $this->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))));