Merge pull request #804 from jeromegamez/EZP-21802_menage_a_deux

EZP-21802: eZImageManagerTest suite only gets executed when ImageMagick and GD are present
ezsystems · Feb 25, 2014 · c98e521 · c98e521
2 parents 1676986 + 4710351
commit c98e521
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tests/tests/lib/ezimage/ezimagemanager_test.php b/tests/tests/lib/ezimage/ezimagemanager_test.php
@@ -61,8 +61,8 @@ public function setUp()
      */
     public function testMultiHandlerAlias()
     {
-        if ( !self::gdIsEnabled() or !self::imageMagickIsEnabled() )
-            $this->markTestSkipped( 'GD and/or ImageMagick are not enabled' );
+        if ( !self::gdIsEnabled() && !self::imageMagickIsEnabled() )
+            $this->markTestSkipped( 'Neither GD nor ImageMagick are enabled' );
 
         $aliasList = $this->imageIni->variable( 'AliasSettings', 'AliasList' );
         array_push( $aliasList, 'multihandler' );