Per r97671, add $wgEnableAutoRotation setting that can be used to explicitly disable...

diff --git a/RELEASE-NOTES-1.18 b/RELEASE-NOTES-1.18
index 1885494..074ff90 100644 (file)
--- a/RELEASE-NOTES-1.18
+++ b/RELEASE-NOTES-1.18
@@ -85,6 +85,8 @@ production.
 * New hook "Collation::factory" to allow extensions to create custom
   category collations.
 * $wgGroupPermissions now supports per namespace permissions.
+* $wgEnableAutoRotation enables or disables auto-rotation. Leaving it set to
+  null will cause MediaWiki to determine if auto-rotation is available.
 
 === New features in 1.18 ===
 * BREAKING CHANGE: action=watch / action=unwatch now requires a token.

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 3317428..a888c3a 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -744,6 +744,12 @@ $wgShowArchiveThumbnails = true;
 /** Obsolete, always true, kept for compatibility with extensions */
 $wgUseImageResize = true;
 
+/**
+ * If set to true, images that contain certain the exif orientation tag will
+ * be rotated accordingly. If set to null, try to auto-detect whether a scaler
+ * is available that can rotate.
+ */
+$wgEnableAutoRotation = null;
 
 /**
  * Internal name of virus scanner. This servers as a key to the

diff --git a/includes/Setup.php b/includes/Setup.php
index 4682994..afde02f 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -187,6 +187,11 @@ if ( $wgUseInstantCommons ) {
        );
 }
 
+if ( is_null( $wgEnableAutoRotation ) ) {
+       // Only enable auto-rotation when the bitmap handler can rotate
+       $wgEnableAutoRotation = BitmapHandler::canRotate();
+}
+
 if ( $wgRCFilterByAge ) {
        # # Trim down $wgRCLinkDays so that it only lists links which are valid
        # # as determined by $wgRCMaxAge.

diff --git a/includes/media/ExifBitmap.php b/includes/media/ExifBitmap.php
index 6b4bf7a..96f5d21 100644 (file)
--- a/includes/media/ExifBitmap.php
+++ b/includes/media/ExifBitmap.php
@@ -162,6 +162,11 @@ class ExifBitmapHandler extends BitmapHandler {
         * @return int 0, 90, 180 or 270
         */
        public function getRotation( $file ) {
+               global $wgEnableAutoRotation;
+               if ( !$wgEnableAutoRotation ) {
+                       return 0;
+               }
+               
                $data = $file->getMetadata();
                return $this->getRotationForExif( $data );
        }