Only rotate images in dynamic view

horde · Jan 9, 2015 · 9b733d0 · 9b733d0
1 parent 8a8f04d
commit 9b733d0
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/imp/lib/Mime/Viewer/Images.php b/imp/lib/Mime/Viewer/Images.php
@@ -98,7 +98,7 @@ protected function _render()
      */
     protected function _renderInline()
     {
-        global $browser, $injector, $page_output;
+        global $browser, $injector, $page_output, $registry;
 
         $type = $this->_getType();
 
@@ -120,8 +120,10 @@ protected function _renderInline()
                 'type' => 'text/html; charset=' . $this->getConfigParam('charset')
             );
 
-            /* Load JPEGs via javascript to allow for rotation. */
-            if ($type === 'image/jpeg') {
+            /* Load JPEGs via javascript, in dynamic view, to allow for
+             * browser-side rotation. */
+            if (($type === 'image/jpeg') &&
+                ($registry->getView() === $registry::VIEW_DYNAMIC)) {
                 $page_output->addScriptFile('external/base64.js');
                 $page_output->addScriptFile('external/load-image.all.min.js');
                 $uid = strval(new Horde_Support_Randomid());