X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fmedia%2FMediaTransformOutput.php;h=3506684a50e306b8ecde4b359f9d2eba82e8c03d;hb=632c3b6a171bb39e167fe4b43f86f42e0933abc2;hp=b3a555aa5c93380eaef3e7d7298bdd5e9310859a;hpb=99dbf4e1d4d7f18e02935bdb8cd3be4413ffe729;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/media/MediaTransformOutput.php b/includes/media/MediaTransformOutput.php index b3a555aa5c..3506684a50 100644 --- a/includes/media/MediaTransformOutput.php +++ b/includes/media/MediaTransformOutput.php @@ -47,13 +47,13 @@ abstract class MediaTransformOutput { /** @var bool|string */ protected $page; - /** @var bool|string Filesystem path to the thumb */ + /** @var bool|string Filesystem path to the thumb */ protected $path; /** @var bool|string Language code, false if not set */ protected $lang; - /** @var bool|string Permanent storage path */ + /** @var bool|string Permanent storage path */ protected $storagePath = false; /** @@ -439,19 +439,12 @@ class ThumbnailImage extends MediaTransformOutput { * @ingroup Media */ class MediaTransformError extends MediaTransformOutput { - /** @var string HTML formatted version of the error */ - private $htmlMsg; - - /** @var string Plain text formatted version of the error */ - private $textMsg; + /** @var Message */ + private $msg; function __construct( $msg, $width, $height /*, ... */ ) { $args = array_slice( func_get_args(), 3 ); - $htmlArgs = array_map( 'htmlspecialchars', $args ); - $htmlArgs = array_map( 'nl2br', $htmlArgs ); - - $this->htmlMsg = wfMessage( $msg )->rawParams( $htmlArgs )->escaped(); - $this->textMsg = wfMessage( $msg )->rawParams( $htmlArgs )->text(); + $this->msg = wfMessage( $msg )->params( $args ); $this->width = intval( $width ); $this->height = intval( $height ); $this->url = false; @@ -461,21 +454,29 @@ class MediaTransformError extends MediaTransformOutput { function toHtml( $options = [] ) { return "