Revert "Revert "Before and after form hooks order""

rubengc · rubengc · commit eaaa4f2fdf93 · 2017-04-04T19:16:17.000+02:00
This reverts commit 54cfa40.
diff --git a/includes/CMB2.php b/includes/CMB2.php
@@ -321,18 +321,6 @@ public function render_form_close( $object_id = 0, $object_type = '' ) {
 
 		$this->render_hidden_fields();
 
-		/**
-		 * Hook after form form has been rendered
-		 *
-		 * @param array  $cmb_id      The current box ID.
-		 * @param int    $object_id   The ID of the current object.
-		 * @param string $object_type The type of object you are working with.
-		 *	                           Usually `post` (this applies to all post-types).
-		 *	                           Could also be `comment`, `user` or `options-page`.
-		 * @param array  $cmb         This CMB2 object.
-		 */
-		do_action( 'cmb2_after_form', $this->cmb_id, $object_id, $object_type, $this );
-
 		/**
 		 * Hook after form form has been rendered
 		 *
@@ -347,6 +335,18 @@ public function render_form_close( $object_id = 0, $object_type = '' ) {
 		 */
 		do_action( "cmb2_after_{$object_type}_form_{$this->cmb_id}", $object_id, $this );
 
+		/**
+		 * Hook after form form has been rendered
+		 *
+		 * @param array  $cmb_id      The current box ID.
+		 * @param int    $object_id   The ID of the current object.
+		 * @param string $object_type The type of object you are working with.
+		 *	                           Usually `post` (this applies to all post-types).
+		 *	                           Could also be `comment`, `user` or `options-page`.
+		 * @param array  $cmb         This CMB2 object.
+		 */
+		do_action( 'cmb2_after_form', $this->cmb_id, $object_id, $object_type, $this );
+
 		echo "\n<!-- End CMB2 Fields -->\n";
 
 	}
