Page MenuHomePhabricator
Files F2323

mw-svg.patch
Public
Actions

Authored By
• bzimport
Nov 21 2014, 8:50 PM
Size
1 KB
Referenced Files
None
Subscribers
None

mw-svg.patch
View Options

diff --git a/includes/media/SVG.php b/includes/media/SVG.php
index 55fa554..5246d36 100644
--- a/includes/media/SVG.php
+++ b/includes/media/SVG.php
@@ -31,6 +31,8 @@ class SvgHandler extends ImageHandler {
function isEnabled() {
global $wgSVGConverters, $wgSVGConverter;
+ if ( $wgSVGConverter == 'none' )
+ return true;
if ( !isset( $wgSVGConverters[$wgSVGConverter] ) ) {
wfDebug( "\$wgSVGConverter is invalid, disabling SVG rendering.\n" );
return false;
@@ -40,7 +42,7 @@ class SvgHandler extends ImageHandler {
}
function mustRender( $file ) {
- return true;
+ return false;
}
function isVectorized( $file ) {
@@ -108,6 +110,7 @@ class SvgHandler extends ImageHandler {
* @return bool|MediaTransformError|ThumbnailImage|TransformParameterError
*/
function doTransform( $image, $dstPath, $dstUrl, $params, $flags = 0 ) {
+ global $wgSVGConverter;
if ( !$this->normaliseParams( $image, $params ) ) {
return new TransformParameterError( $params );
}
@@ -115,6 +118,11 @@ class SvgHandler extends ImageHandler {
$clientHeight = $params['height'];
$physicalWidth = $params['physicalWidth'];
$physicalHeight = $params['physicalHeight'];
+
+ if ( $wgSVGConverter == 'none' )
+ {
+ return new ThumbnailImage( $image, $image->getURL(), $clientWidth, $clientHeight, null );
+ }
if ( $flags & self::TRANSFORM_LATER ) {
return new ThumbnailImage( $image, $dstUrl, $dstPath, $params );
@@ -217,6 +225,9 @@ class SvgHandler extends ImageHandler {
}
function getThumbType( $ext, $mime, $params = null ) {
+ global $wgSVGConverter;
+ if ( $wgSVGConverter == 'none' )
+ return array( 'svg', 'image/xml+svg' );
return array( 'png', 'image/png' );
}

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1899
Default Alt Text
mw-svg.patch (1 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL · Credits