Fixes for PR

jamesrwilliams · Sep 17, 2021 · 6eabf52 · 6eabf52
1 parent 9f52246
commit 6eabf52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/flagpole.php b/flagpole.php
@@ -99,7 +99,10 @@ function flagpole_admin_imports( $hook ) {
 require plugin_dir_path( __FILE__ ) . 'includes/admin/settings-page.php';
 require plugin_dir_path( __FILE__ ) . 'includes/api/api.general.php';
 require plugin_dir_path( __FILE__ ) . 'includes/api/api.shortcode.php';
-require plugin_dir_path( __FILE__ ) . 'includes/acf/class-acf-filter.php';
+
+if ( class_exists( 'ACF' ) ) {
+	require plugin_dir_path( __FILE__ ) . 'includes/acf/class-acf-filter.php';
+}
 
 /**
  * AJAX Action toggling features from the WP admin area.
@@ -354,6 +357,6 @@ function flagpole_operation_redirect( $error_code = false, $redirect = true ) {
  *
  * @return void
  */
-function flagpole_acf_location_type(): void {
+function flagpole_acf_location_type() {
 	acf_register_location_type( 'Flagpole\ACF_Filter' );
 }
diff --git a/includes/acf/class-acf-filter.php b/includes/acf/class-acf-filter.php
@@ -6,8 +6,6 @@
  * @package Peake\Plugins
  */
 
-declare( strict_types=1 );
-
 namespace Flagpole;
 
 use ACF_Location;
@@ -29,7 +27,7 @@ class ACF_Filter extends ACF_Location {
 	 *
 	 * @return void
 	 */
-	public function initialize(): void {
+	public function initialize() {
 		$this->name     = 'feature-flags';
 		$this->label    = __( 'Feature flags', 'flagpole' );
 		$this->category = 'forms';