Fix mistakes from rebase

jtsternberg · jtsternberg · commit 12cea1394b96 · 2016-09-08T12:19:37.000-05:00
diff --git a/includes/CMB2_Field.php b/includes/CMB2_Field.php
@@ -1101,7 +1101,6 @@ public function _set_field_defaults( $args ) {
 			'column'            => false,
 			'js_dependencies'   => array(),
 			'show_in_rest'      => null,
-			'js_dependencies'   => array(),
 		) );
 
 		/*
diff --git a/includes/CMB2_Hookup_Base.php b/includes/CMB2_Hookup_Base.php
@@ -25,6 +25,11 @@ abstract class CMB2_Hookup_Base {
 	 */
 	protected $object_type = 'post';
 
+	/**
+	 * Constructor
+	 * @since 2.0.0
+	 * @param CMB2 $cmb The CMB2 object to hookup
+	 */
 	public function __construct( CMB2 $cmb ) {
 		$this->cmb = $cmb;
 		$this->object_type = $this->cmb->mb_object_type();
diff --git a/includes/CMB2_hookup.php b/includes/CMB2_hookup.php
@@ -27,26 +27,13 @@ class CMB2_hookup extends CMB2_Hookup_Base {
 	 */
 	protected static $css_registration_done = false;
 
-	/**
-	 * @var   CMB2 object
-	 * @since 2.0.2
-	 */
-	protected $cmb;
-
 	/**
 	 * CMB taxonomies array for term meta
 	 * @var   array
 	 * @since 2.2.0
 	 */
 	protected $taxonomies = array();
 
-	/**
-	 * The object type we are performing the hookup for
-	 * @var   string
-	 * @since 2.0.9
-	 */
-	protected $object_type = 'post';
-
 	/**
 	 * Custom field columns.
 	 * @var   array
