CMB2/CMB2_Base::do_callback() now accepts a $additional_params second…

… param
boob-sbcm · Nov 14, 2017 · 131e9ac · 131e9ac
1 parent 498fa8d
commit 131e9ac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/includes/CMB2.php b/includes/CMB2.php
@@ -1649,11 +1649,12 @@ public function search_old_school_array( $field_id, $fields ) {
 	 * Handles metabox property callbacks, and passes this $cmb object as property.
 	 *
 	 * @since  2.2.3
-	 * @param  callable $cb The callback method/function/closure.
-	 * @return mixed        Return of the callback function.
+	 * @param  callable $cb                The callback method/function/closure
+	 * @param  mixed    $additional_params Any additoinal parameters which should be passed to the callback.
+	 * @return mixed                       Return of the callback function.
 	 */
-	protected function do_callback( $cb ) {
-		return call_user_func( $cb, $this );
+	public function do_callback( $cb, $additional_params = null ) {
+		return call_user_func( $cb, $this, $additional_params );
 	}
 
 	/**

diff --git a/includes/CMB2_Base.php b/includes/CMB2_Base.php
@@ -307,11 +307,12 @@ public function unset_param_callback_cache( $param ) {
 	 * Handles the parameter callbacks, and passes this object as parameter.
 	 *
 	 * @since  2.2.3
-	 * @param  callable $cb The callback method/function/closure
-	 * @return mixed        Return of the callback function.
+	 * @param  callable $cb                The callback method/function/closure
+	 * @param  mixed    $additional_params Any additoinal parameters which should be passed to the callback.
+	 * @return mixed                       Return of the callback function.
 	 */
-	protected function do_callback( $cb ) {
-		return call_user_func( $cb, $this->{$this->properties_name}, $this );
+	protected function do_callback( $cb, $additional_params = null ) {
+		return call_user_func( $cb, $this->{$this->properties_name}, $this, $additional_params );
 	}
 
 	/**