aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-01-29 15:54:39 +0000
committerMichael Scherer <misc@mageia.org>2012-01-29 15:54:39 +0000
commit410b1de84381425fd591f1602072609e99bb3c21 (patch)
treeb4ae64de34ec3b7976c1723d9c154f4fad8dc086
parent1ac1aa92b942acfe999171f7cc7ad648590c0479 (diff)
downloadpuppet-410b1de84381425fd591f1602072609e99bb3c21.tar
puppet-410b1de84381425fd591f1602072609e99bb3c21.tar.gz
puppet-410b1de84381425fd591f1602072609e99bb3c21.tar.bz2
puppet-410b1de84381425fd591f1602072609e99bb3c21.tar.xz
puppet-410b1de84381425fd591f1602072609e99bb3c21.zip
use gd rather than convert, see #3202 ( in short, imagemagick do not work on some images )
-rw-r--r--modules/mediawiki/templates/LocalSettings.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/mediawiki/templates/LocalSettings.php b/modules/mediawiki/templates/LocalSettings.php
index af15e14b..3e0b7bd3 100644
--- a/modules/mediawiki/templates/LocalSettings.php
+++ b/modules/mediawiki/templates/LocalSettings.php
@@ -72,8 +72,10 @@ $wgMemCachedServers = array();
## To enable image uploads, make sure the 'images' directory
## is writable, then set this to true:
$wgEnableUploads = false;
-$wgUseImageMagick = true;
-$wgImageMagickConvertCommand = "/usr/bin/convert";
+# use gd, as convert do not work for big image
+# see https://bugs.mageia.org/show_bug.cgi?id=3202
+$wgUseImageMagick = false;
+#$wgImageMagickConvertCommand = "/usr/bin/convert";
## If you use ImageMagick (or any other shell command) on a
## Linux server, this will need to be set to the name of an