Fixed Delete Type missing

[TickTackk]

In XenGallery_Model_InlineMod_Media

    public function undeleteMedia(array $mediaIds, array $options = array(), &$errorKey = '', array $viewingUser = null)
    {
        $media = $this->getMediaData($mediaIds);

        if (empty($options['skipPermissions']) && !$this->canDeleteMediaData($media, $errorKey, $viewingUser))
        {
            return false;
        }

        $this->_updateMediaMediaState($media, 'visible', 'deleted');

        return true;
    }

should be

    public function undeleteMedia(array $mediaIds, array $options = array(), &$errorKey = '', array $viewingUser = null)
    {
        $media = $this->getMediaData($mediaIds);

        if (empty($options['skipPermissions']) && !$this->canDeleteMediaData($media, $options['delete_type'], $errorKey, $viewingUser))
        {
            return false;
        }

        $this->_updateMediaMediaState($media, 'visible', 'deleted');

        return true;
    }

 

[Chris D]

That wouldn't be the exact fix, but it is fixed now, thanks

 

[TickTackk]

What would be the exact fix then? Using array_merge with default values? Or something else?

 

[Chris D]

The fix is to replace $options['delete_type'] in your fix with simply 'soft'. We don't actually need to consider hard delete permissions here. If you can soft delete the media, then you should be able to undelete it.