Merge branch '5.3' into 5.4

diff --cc wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygAttachmentFormField.class.php
index 6544ca372cd23fbc82e4f7c2ed2412d6097e08ee,ceb9b29b236c1c6771ee6f5107d85b66a3b4db9d..6141872e97885f9c4faff1fdf9aae4de59ccab8c
--- 1/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygAttachmentFormField.class.php
--- 2/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygAttachmentFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/wysiwyg/WysiwygAttachmentFormField.class.php
@@@ -12,149 -10,143 +12,151 @@@ use wcf\util\StringUtil
  
  /**
   * Represents the form field to manage attachments for a wysiwyg form container.
 - * 
 + *
   * If no attachment handler has been set, this field is not available.
 - * 
 - * @author    Matthias Schmidt
 - * @copyright 2001-2019 WoltLab GmbH
 - * @license   GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
 - * @package   WoltLabSuite\Core\System\Form\Builder\Field\Wysiwyg
 - * @since     5.2
 + *
 + * @author  Matthias Schmidt
 + * @copyright   2001-2019 WoltLab GmbH
 + * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
 + * @package WoltLabSuite\Core\System\Form\Builder\Field\Wysiwyg
 + * @since   5.2
   */
 -class WysiwygAttachmentFormField extends AbstractFormField {
 -      use TWysiwygFormNode;
 -      
 -      /**
 -       * attachment handler
 -       * @var null|AttachmentHandler
 -       */
 -      protected $attachmentHandler;
 -      
 -      /**
 -       * @inheritDoc
 -       */
 -      protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/Wysiwyg/Attachment';
 -      
 -      /**
 -       * @inheritDoc
 -       */
 -      protected $templateName = '__wysiwygAttachmentFormField';
 -      
 -      /**
 -       * Creates a new instance of `WysiwygAttachmentFormField`.
 -       */
 -      public function __construct() {
 -              $this->addClass('wide');
 -      }
 -      
 -      /**
 -       * Sets the attachment handler object for the uploaded attachments. If `null` is given,
 -       * the previously set attachment handler is unset.
 -       * 
 -       * For the initial attachment handler set by this method, the temporary hashes will be
 -       * automatically set by either reading them from the session variables if the form handles
 -       * AJAX requests or by creating a new one. If the temporary hashes are read from session,
 -       * the session variable will be unregistered afterwards.
 -       * 
 -       * @param       null|AttachmentHandler          $attachmentHandler
 -       * @return      WysiwygAttachmentFormField
 -       */
 -      public function attachmentHandler(AttachmentHandler $attachmentHandler = null) {
 -              if ($attachmentHandler !== null) {
 -                      if ($this->attachmentHandler === null) {
 -                              $tmpHash = StringUtil::getRandomID();
 -                              if ($this->getDocument()->isAjax()) {
 -                                      $sessionTmpHash = WCF::getSession()->getVar('__wcfAttachmentTmpHash');
 -                                      if ($sessionTmpHash !== null) {
 -                                              $tmpHash = $sessionTmpHash;
 -                                              
 -                                              WCF::getSession()->unregister('__wcfAttachmentTmpHash');
 -                                      }
 -                              }
 -                              
 -                              $attachmentHandler->setTmpHashes([$tmpHash]);
 -                      }
 -                      else {
 -                              // preserve temporary hashes
 -                              $attachmentHandler->setTmpHashes($this->attachmentHandler->getTmpHashes());
 -                      }
 -              }
 -              
 -              $this->attachmentHandler = $attachmentHandler;
 -              
 -              if ($this->attachmentHandler !== null) {
 -                      $this->description('wcf.attachment.upload.limits', [
 -                              'attachmentHandler' => $this->attachmentHandler
 -                      ]);
 -              }
 -              else {
 -                      $this->description();
 -              }
 -              
 -              return $this;
 -      }
 -      
 -      /**
 -       * Returns the attachment handler object for the uploaded attachments or `null` if no attachment
 -       * upload is supported.
 -       * 
 -       * @return      null|AttachmentHandler
 -       */
 -      public function getAttachmentHandler() {
 -              return $this->attachmentHandler;
 -      }
 -      
 -      /**
 -       * @inheritDoc
 -       */
 -      public function hasSaveValue() {
 -              return false;
 -      }
 -      
 -      /**
 -       * @inheritDoc
 -       */
 -      public function isAvailable() {
 -              return parent::isAvailable()
 -                      && $this->getAttachmentHandler() !== null
 -                      && $this->getAttachmentHandler()->canUpload();
 -      }
 -      
 -      /**
 -       * @inheritDoc
 -       */
 -      public function populate() {
 -              parent::populate();
 -              
 -              $this->getDocument()->getDataHandler()->addProcessor(new CustomFormDataProcessor($this->getId(), function(IFormDocument $document, array $parameters) {
 -                      if ($this->getAttachmentHandler() !== null) {
 -                              $parameters[$this->getWysiwygId() . '_attachmentHandler'] = $this->getAttachmentHandler();
 -                      }
 -                      
 -                      return $parameters;
 -              }));
 -              
 -              return $this;
 -      }
 -      
 -      /**
 -       * @inheritDoc
 -       */
 -      public function readValue() {
 -              if ($this->getDocument()->hasRequestData($this->getPrefixedId() . '_tmpHash')) {
 -                      $tmpHash = $this->getDocument()->getRequestData($this->getPrefixedId() . '_tmpHash');
 -                      if (is_string($tmpHash)) {
 -                              $this->getAttachmentHandler()->setTmpHashes([$tmpHash]);
 -                      }
 -                      else if (is_array($tmpHash)) {
 -                              $this->getAttachmentHandler()->setTmpHashes($tmpHash);
 -                      }
 -              }
 -      }
 +class WysiwygAttachmentFormField extends AbstractFormField
 +{
 +    use TWysiwygFormNode;
 +
 +    /**
 +     * attachment handler
 +     * @var null|AttachmentHandler
 +     */
 +    protected $attachmentHandler;
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/Wysiwyg/Attachment';
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    protected $templateName = '__wysiwygAttachmentFormField';
 +
 +    /**
 +     * Creates a new instance of `WysiwygAttachmentFormField`.
 +     */
 +    public function __construct()
 +    {
 +        $this->addClass('wide');
 +    }
 +
 +    /**
 +     * Sets the attachment handler object for the uploaded attachments. If `null` is given,
 +     * the previously set attachment handler is unset.
 +     *
 +     * For the initial attachment handler set by this method, the temporary hashes will be
 +     * automatically set by either reading them from the session variables if the form handles
 +     * AJAX requests or by creating a new one. If the temporary hashes are read from session,
 +     * the session variable will be unregistered afterwards.
 +     *
 +     * @param null|AttachmentHandler $attachmentHandler
 +     * @return  WysiwygAttachmentFormField
 +     */
 +    public function attachmentHandler(?AttachmentHandler $attachmentHandler = null)
 +    {
 +        if ($attachmentHandler !== null) {
 +            if ($this->attachmentHandler === null) {
 +                $tmpHash = StringUtil::getRandomID();
 +                if ($this->getDocument()->isAjax()) {
 +                    $sessionTmpHash = WCF::getSession()->getVar('__wcfAttachmentTmpHash');
 +                    if ($sessionTmpHash !== null) {
 +                        $tmpHash = $sessionTmpHash;
 +
 +                        WCF::getSession()->unregister('__wcfAttachmentTmpHash');
 +                    }
 +                }
 +
 +                $attachmentHandler->setTmpHashes([$tmpHash]);
 +            } else {
 +                // preserve temporary hashes
 +                $attachmentHandler->setTmpHashes($this->attachmentHandler->getTmpHashes());
 +            }
 +        }
 +
 +        $this->attachmentHandler = $attachmentHandler;
 +
 +        if ($this->attachmentHandler !== null) {
 +            $this->description('wcf.attachment.upload.limits', [
 +                'attachmentHandler' => $this->attachmentHandler,
 +            ]);
 +        } else {
 +            $this->description();
 +        }
 +
 +        return $this;
 +    }
 +
 +    /**
 +     * Returns the attachment handler object for the uploaded attachments or `null` if no attachment
 +     * upload is supported.
 +     *
 +     * @return  null|AttachmentHandler
 +     */
 +    public function getAttachmentHandler()
 +    {
 +        return $this->attachmentHandler;
 +    }
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    public function hasSaveValue()
 +    {
 +        return false;
 +    }
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    public function isAvailable()
 +    {
-         return parent::isAvailable() && $this->getAttachmentHandler() !== null;
++        return parent::isAvailable()
++            && $this->getAttachmentHandler() !== null
++            && $this->getAttachmentHandler()->canUpload();
 +    }
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    public function populate()
 +    {
 +        parent::populate();
 +
 +        $this->getDocument()->getDataHandler()->addProcessor(new CustomFormDataProcessor(
 +            $this->getId(),
 +            function (IFormDocument $document, array $parameters) {
 +                if ($this->getAttachmentHandler() !== null) {
 +                    $parameters[$this->getWysiwygId() . '_attachmentHandler'] = $this->getAttachmentHandler();
 +                }
 +
 +                return $parameters;
 +            }
 +        ));
 +
 +        return $this;
 +    }
 +
 +    /**
 +     * @inheritDoc
 +     */
 +    public function readValue()
 +    {
 +        if ($this->getDocument()->hasRequestData($this->getPrefixedId() . '_tmpHash')) {
 +            $tmpHash = $this->getDocument()->getRequestData($this->getPrefixedId() . '_tmpHash');
 +            if (\is_string($tmpHash)) {
 +                $this->getAttachmentHandler()->setTmpHashes([$tmpHash]);
 +            } elseif (\is_array($tmpHash)) {
 +                $this->getAttachmentHandler()->setTmpHashes($tmpHash);
 +            }
 +        }
 +    }
  }