Make sure that all providers list tables call parent::get_columns to avoid conflicts with filters. Make sure that columns have cb and ID. Closes #49

Author: rinatkhaziev

ad-code-manager.php

@@ -57,7 +57,6 @@ class Ad_Code_Manager
 	 * @since 0.1
 	 */
 	function __construct() {
-
 		add_action( 'init', array( $this, 'action_load_providers' ) );
 		add_action( 'init', array( $this, 'action_init' ) );
 
@@ -133,7 +132,6 @@ function action_load_providers() {
 		// Nothing to do without a provider
 		if ( !is_object( $this->current_provider ) )
 			return ;
-
 		/**
 		 * Configuration filter: acm_whitelisted_script_urls
 		 * A security filter to whitelist which ad code script URLs can be added in the admin

common/lib/acm-wp-list-table.php

@@ -23,16 +23,29 @@ function __construct( $params = array() ) {
 	* Define the columns that are going to be used in the table
 	* @return array $columns, the array of columns to use with the table
 	*/
-	function get_columns() {
-		$columns = array(
+	function get_columns( $columns = false ) {
+
+		$default = array(
 			'cb'             => '<input type="checkbox" />',
 			'id'             => __( 'ID', 'ad-code-manager' ),
 			'name'           => __( 'Name', 'ad-code-manager' ),
 			'priority'       => __( 'Priority', 'ad-code-manager' ),
 			'operator'       => __( 'Logical Operator', 'ad-code-manager' ),
 			'conditionals'   => __( 'Conditionals', 'ad-code-manager' ),
 		);
-		return apply_filters( 'acm_list_table_columns', $columns );
+		$columns = apply_filters( 'acm_list_table_columns', !is_array( $columns ) || empty( $columns ) ? $default : $columns );
+		// Fail-safe for misconfiguration
+		$required_before = array(
+			'cb'             => '<input type="checkbox" />',
+			'id'             => __( 'ID', 'ad-code-manager' ),		
+		);
+		$required_after = array(
+			'priority'       => __( 'Priority', 'ad-code-manager' ),
+			'operator'       => __( 'Logical Operator', 'ad-code-manager' ),
+			'conditionals'   => __( 'Conditionals', 'ad-code-manager' ),	
+		);
+		$columns = array_merge( $required_before, $columns, $required_after  );
+		return $columns;
 	}
 
 	/**

providers/doubleclick-for-publishers.php

@@ -80,15 +80,6 @@ function __construct() {
 
 		parent::__construct();
 	}
-
-
-	/**
-	 * Filter the columns that can appear in the list table of ad codes
-	 */
-	function filter_list_table_columns( $columns ) {
-
-		return $columns;
-	}
 }
 
 class Doubleclick_For_Publishers_ACM_WP_List_Table extends ACM_WP_List_Table {
@@ -114,7 +105,7 @@ function get_columns() {
 			'operator'       => __( 'Logical Operator', 'ad-code-manager' ),
 			'conditionals'   => __( 'Conditionals', 'ad-code-manager' ),
 		);
-		return apply_filters( 'acm_list_table_columns', $columns );
+		return parent::get_columns( $columns );
 	}
 
 	/**

providers/google-adsense.php

@@ -48,7 +48,7 @@ public function __construct() {
 		);
 
 		parent::__construct();
-	}
+	}	
 }
 
 /**
@@ -82,8 +82,7 @@ public function get_columns() {
 			'priority'       => __( 'Priority', 'ad-code-manager' ),
 			'conditionals'   => __( 'Conditionals', 'ad-code-manager' ),
 		);
-
-		return apply_filters( 'acm_list_table_columns', $columns );
+		return parent::get_columns( $columns );
 	}
 
 	/**