Fix wp-graphql activation check

valu-digital · Jan 27, 2020 · f14f0e4 · f14f0e4
1 parent 7a49140
commit f14f0e4
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Loader.php b/src/Loader.php
@@ -8,11 +8,6 @@ class Loader
     private $pll_context_called = false;
 
     static function init() {
-        // Bail out early if WPGraphQL is not activated.
-        if (!class_exists('WPGraphQL')) {
-            return;
-        };
-
         define('WPGRAPHQL_POLYLANG', true);
         (new Loader())->bind_hooks();
     }
@@ -102,6 +97,11 @@ function endsWith($haystack, $needle)
 
     function is_graphql_request()
     {
+        // Detect WPGraphQL activation by checking if the main class is defined
+        if (!class_exists('WPGraphQL')) {
+            return false;
+        };
+
         if (!defined('POLYLANG_VERSION')) {
             return false;
         }