From a3c6afa03fae7f6dbbb8586d828c7bc1a9cf7880 Mon Sep 17 00:00:00 2001 From: Robin Cornett Date: Sun, 7 Jun 2015 12:06:55 -0400 Subject: [PATCH] Simplify deactivation --- includes/class-displayfeaturedimagegenesis.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/includes/class-displayfeaturedimagegenesis.php b/includes/class-displayfeaturedimagegenesis.php index 9998bda..1cb4bf2 100644 --- a/includes/class-displayfeaturedimagegenesis.php +++ b/includes/class-displayfeaturedimagegenesis.php @@ -57,12 +57,8 @@ class Display_Featured_Image_Genesis { * */ public function deactivate() { - if ( version_compare( PHP_VERSION, '5.3', '>=' ) ) { - deactivate_plugins( plugin_basename( dirname( __DIR__ ) ) . '/display-featured-image-genesis.php' ); // __DIR__ is a magic constant introduced in PHP 5.3 - } - else { - deactivate_plugins( plugin_basename( dirname( dirname( __FILE__ ) ) ) . '/display-featured-image-genesis.php' ); - } + $dirname = version_compare( PHP_VERSION, '5.3', '>=' ) ? __DIR__ : dirname( __FILE__ ); + deactivate_plugins( plugin_basename( dirname( $dirname ) ) . '/display-featured-image-genesis.php' ); } /**