Clean up code to prevent potential null pointer exceptions.

newfold-labs · Apr 27, 2023 · 76228a4 · 76228a4
1 parent 333086a
commit 76228a4
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/includes/functions.php b/includes/functions.php
@@ -37,11 +37,15 @@ function unregister( string $name ) {
  */
 function activate( string $name ) {
 
-	$module = ModuleRegistry::get( $name );
+	if ( ModuleRegistry::has( $name ) ) {
 
-	// Activate module
-	$module->isActive = true;
-	options()->set( $name, true );
+		/** @var Module $module */
+		$module = ModuleRegistry::get( $name );
+
+		// Activate module
+		$module->isActive = true;
+		options()->set( $name, true );
+	}
 }
 
 /**
@@ -51,11 +55,16 @@ function activate( string $name ) {
  */
 function deactivate( string $name ) {
 
-	$module = ModuleRegistry::get( $name );
+	if ( ModuleRegistry::has( $name ) ) {
+
+		/** @var Module $module */
+		$module = ModuleRegistry::get( $name );
 
-	// Deactivate module
-	$module->isActive = false;
-	options()->set( $name, false );
+		// Deactivate module
+		$module->isActive = false;
+		options()->set( $name, false );
+
+	}
 }
 
 /**
@@ -66,9 +75,7 @@ function deactivate( string $name ) {
  * @return bool
  */
 function isActive( string $name ) {
-	$module = ModuleRegistry::get( $name );
-
-	return $module->get( 'isActive', false );
+	return ModuleRegistry::getActive()->has( $name );
 }
 
 /**