Commit d65c0eb7 authored by Ben's avatar Ben
Browse files

Merge branch 'master' of gitlab.com:minds/engine into feat/admin-manual-transcoding-2237

parents aefc6715 4fb65001

Controllers/api/v2/issues.php

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ class issues implements Interfaces\Api 
        $issue = new Issue;

        $issue->setTitle($title)

            ->setDescription($description)

            ->setLabels('S - Triage (New), T - Bug (Triage)');

            ->setLabels('Status::Validation, Type::Bug (Triage)');



        // call gitlab api

        $res = $manager->postIssue($issue, $pages[0]);

Core/Media/Thumbnails.php

+3 −2
Original line number Diff line number Diff line
@@ -26,9 +26,10 @@ class Thumbnails 
     */

    public function get($entity, $size)

    {

        if (is_string($entity)) {

            $entity = $this->entitiesBuilder->build($entity);

        if (is_numeric($entity)) {

            $entity = $this->entitiesBuilder->single($entity);

        }



        if (!$entity || !Core\Security\ACL::_()->read($entity)) {

            return false;

        }

Core/Security/Spam.php

+3 −1
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ class Spam 
                    $foundSpam = Text::strposa($entity->getBody(), ProhibitedDomains::DOMAINS);

                    break;

                }

                if (method_exists($entity, 'getDescription')) {

                    $foundSpam = Text::strposa($entity->getDescription(), ProhibitedDomains::DOMAINS);

                }

                break;

            case 'user':

                $foundSpam = Text::strposa($entity->briefdescription, ProhibitedDomains::DOMAINS);

Entities/Image.php

+22 −0
Original line number Diff line number Diff line
@@ -386,4 +386,26 @@ class Image extends File 
        $this->time_sent = $time_sent;

        return $this;

    }





    /**

     * Return description

     * @return string

     */

    public function getDescription(): string

    {

        return $this->description  ?: '';

    }



    /**

    * Set description

    *

    * @param string $description - description to be set.

    * @return Image

    */

    public function setDescription($description): Image

    {

        $this->description = $description;

        return $this;

    }

}

Entities/Video.php

+21 −0
Original line number Diff line number Diff line
@@ -296,4 +296,25 @@ class Video extends MindsObject 
        $this->time_sent = $time_sent;

        return $this;

    }



    /**

     * Return description

     * @return string

     */

    public function getDescription(): string

    {

        return $this->description  ?: '';

    }



    /**

    * Set description

    *

    * @param string $description - description to be set.

    * @return Video

    */

    public function setDescription($description): Video

    {

        $this->description = $description;

        return $this;

    }

}