Changeset 17004 for trunk/admin/include/image.class.php

Timestamp:

Jul 25, 2012, 12:32:34 PM (12 years ago)

Author:

plg

Message:

merge r17003 from branch 2.4 to trunk

bug 2705 (related to): if rotate function is called with a 0 (zero) angle,
like plugin RotateImage may do, ExtIM fails with the same error
"convert: invalid argument for option `-rotate': -orient"

File:

• trunk/admin/include/image.class.php (modified) (1 diff)

trunk/admin/include/image.class.php

@@ -560 +560 @@
   function rotate($rotation)
   {
+    if (empty($rotation))
+    {
+      return true;
+    }
+
     if ($rotation==90 || $rotation==270)
     {