fixed options init (in tests)

ThemeFuse · Jan 4, 2017 · ca14331 · ca14331
1 parent 143ec38
commit ca14331
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/framework/core/components/backend.php b/framework/core/components/backend.php
@@ -226,11 +226,9 @@ private function register_option_type( $option_type_class, $type = null ) {
 		}
 
 		if ( isset( $this->option_types[ $type ] ) ) {
-			if ( isset( $this->option_types[ $type ] ) ) {
-				trigger_error( 'Option type "' . $type . '" already registered', E_USER_WARNING );
+			trigger_error( 'Option type "' . $type . '" already registered', E_USER_WARNING );
 
-				return;
-			}
+			return;
 		}
 
 		$this->option_types[$type] = $option_type_class;
@@ -256,11 +254,9 @@ private function register_container_type( $container_type_class, $type = null )
 		}
 
 		if ( isset( $this->container_types[ $type ] ) ) {
-			if ( isset( $this->container_types[ $type ] ) ) {
-				trigger_error( 'Container type "' . $type . '" already registered', E_USER_WARNING );
+			trigger_error( 'Container type "' . $type . '" already registered', E_USER_WARNING );
 
-				return;
-			}
+			return;
 		}
 
 		$this->container_types[$type] = $container_type_class;
@@ -1588,8 +1584,10 @@ public function _register_container_type( FW_Access_Key $access_key, $container_
 	 * @return FW_Option_Type
 	 */
 	public function option_type( $type ) {
-		if ( ! did_action( $init_action = 'fw_option_types_init' ) ) {
-			do_action( $init_action );
+		static $did_options_init = false;
+		if ( ! $did_options_init ) {
+			$did_options_init = true;
+			do_action( 'fw_option_types_init' );
 		}
 
 		if ( isset( $this->option_types[ $type ] ) ) {
@@ -1610,9 +1608,9 @@ public function option_type( $type ) {
 
 			if ( ! $this->undefined_option_type ) {
 				$this->undefined_option_type = new FW_Option_Type_Undefined();
-			} else {
-				return $this->undefined_option_type;
 			}
+
+			return $this->undefined_option_type;
 		}
 	}
 
@@ -1645,8 +1643,10 @@ public function get_container_types() {
 	 * @return FW_Container_Type
 	 */
 	public function container_type( $type ) {
-		if ( ! did_action( $init_action = 'fw_container_types_init' ) ) {
-			do_action( $init_action );
+		static $did_containers_init = false;
+		if ( ! $did_containers_init ) {
+			$did_containers_init = true;
+			do_action( 'fw_container_types_init' );
 		}
 
 		if ( isset( $this->container_types[ $type ] ) ) {
@@ -1667,9 +1667,9 @@ public function container_type( $type ) {
 
 			if ( ! $this->undefined_container_type ) {
 				$this->undefined_container_type = new FW_Container_Type_Undefined();
-			} else {
-				return $this->undefined_container_type;
 			}
+
+			return $this->undefined_container_type;
 		}
 	}