Completed
Pull Request — master (#729)
by Zack
18:48 queued 14:22
created
includes/class-admin-approve-entries.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
 	 *
276 276
 	 * @uses  GravityView_frontend::get_search_criteria() Convert the $_POST search request into a properly formatted request.
277 277
 	 * @access public
278
-	 * @return void|boolean
278
+	 * @return false|null
279 279
 	 */
280 280
 	public function process_bulk_action() {
281 281
 
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 	 * @param array|boolean $entries If array, array of entry IDs that are to be updated. If true: update all entries.
361 361
 	 * @param int $approved Approved status. If `0`: unapproved, if not empty, `Approved`
362 362
 	 * @param int $form_id The Gravity Forms Form ID
363
-	 * @return boolean|void
363
+	 * @return false|null
364 364
 	 */
365 365
 	private static function update_bulk( $entries, $approved, $form_id ) {
366 366
 
@@ -609,7 +609,7 @@  discard block
 block discarded – undo
609 609
 	 * @access public
610 610
 	 * @static
611 611
 	 * @param mixed $form GF Form or Form ID
612
-	 * @return false|null|string Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set.
612
+	 * @return integer Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set.
613 613
 	 */
614 614
 	static public function get_approved_column( $form ) {
615 615
 
Please login to merge, or discard this patch.
includes/class-frontend-views.php 1 patch
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 
151 151
 	/**
152 152
 	 * Sets the single entry ID and also the entry
153
-	 * @param bool|int|string $single_entry
153
+	 * @param boolean|string $single_entry
154 154
 	 */
155 155
 	public function setSingleEntry( $single_entry ) {
156 156
 
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
 
168 168
 	/**
169 169
 	 * Set the current entry
170
-	 * @param array|int $entry Entry array or entry slug or ID
170
+	 * @param boolean|string $entry Entry array or entry slug or ID
171 171
 	 */
172 172
 	public function setEntry( $entry ) {
173 173
 
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 	 *
226 226
 	 *
227 227
 	 *
228
-	 * @param null $view_id
228
+	 * @param string $view_id
229 229
 	 */
230 230
 	public function set_context_view_id( $view_id = null ) {
231 231
 
@@ -957,7 +957,7 @@  discard block
 block discarded – undo
957 957
 	 *
958 958
 	 * @uses  gravityview_get_entries()
959 959
 	 * @access public
960
-	 * @param array $args\n
960
+	 * @param array $args
961 961
 	 *   - $id - View id
962 962
 	 *   - $page_size - Page
963 963
 	 *   - $sort_field - form field id to sort
@@ -1413,7 +1413,7 @@  discard block
 block discarded – undo
1413 1413
 	/**
1414 1414
 	 * Checks if field (column) is sortable
1415 1415
 	 *
1416
-	 * @param string $field Field settings
1416
+	 * @param string $field_id Field settings
1417 1417
 	 * @param array $form Gravity Forms form array
1418 1418
 	 *
1419 1419
 	 * @since 1.7
Please login to merge, or discard this patch.
includes/class-api.php 1 patch
Indentation   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -146,20 +146,20 @@  discard block
 block discarded – undo
146 146
 
147 147
 		if( !empty( $field['custom_class'] ) ) {
148 148
 
149
-            $custom_class = $field['custom_class'];
149
+			$custom_class = $field['custom_class'];
150 150
 
151
-            if( !empty( $entry ) ) {
151
+			if( !empty( $entry ) ) {
152 152
 
153
-                // We want the merge tag to be formatted as a class. The merge tag may be
154
-                // replaced by a multiple-word value that should be output as a single class.
155
-                // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
156
-                add_filter('gform_merge_tag_filter', 'sanitize_html_class');
153
+				// We want the merge tag to be formatted as a class. The merge tag may be
154
+				// replaced by a multiple-word value that should be output as a single class.
155
+				// "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
156
+				add_filter('gform_merge_tag_filter', 'sanitize_html_class');
157 157
 
158
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
158
+				$custom_class = self::replace_variables( $custom_class, $form, $entry);
159 159
 
160
-                // And then we want life to return to normal
161
-                remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
162
-            }
160
+				// And then we want life to return to normal
161
+				remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
162
+			}
163 163
 
164 164
 			// And now we want the spaces to be handled nicely.
165 165
 			$classes[] = gravityview_sanitize_html_class( $custom_class );
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
 			'format' => $format,
278 278
 			'entry' => $entry,
279 279
 			'field_type' => $field_type, /** {@since 1.6} */
280
-		    'field_path' => $field_path, /** {@since 1.16} */
280
+			'field_path' => $field_path, /** {@since 1.16} */
281 281
 		));
282 282
 
283 283
 		if( ! empty( $field_path ) ) {
@@ -594,32 +594,32 @@  discard block
 block discarded – undo
594 594
 		return sanitize_title( $slug );
595 595
 	}
596 596
 
597
-    /**
598
-     * If using the entry custom slug feature, make sure the new entries have the custom slug created and saved as meta
599
-     *
600
-     * Triggered by add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
601
-     *
602
-     * @param $entry array Gravity Forms entry object
603
-     * @param $form array Gravity Forms form object
604
-     */
605
-    public static function entry_create_custom_slug( $entry, $form ) {
606
-        /**
607
-         * @filter `gravityview_custom_entry_slug` On entry creation, check if we are using the custom entry slug feature and update the meta
608
-         * @param boolean $custom Should we process the custom entry slug?
609
-         */
610
-        $custom = apply_filters( 'gravityview_custom_entry_slug', false );
611
-        if( $custom ) {
612
-            // create the gravityview_unique_id and save it
597
+	/**
598
+	 * If using the entry custom slug feature, make sure the new entries have the custom slug created and saved as meta
599
+	 *
600
+	 * Triggered by add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
601
+	 *
602
+	 * @param $entry array Gravity Forms entry object
603
+	 * @param $form array Gravity Forms form object
604
+	 */
605
+	public static function entry_create_custom_slug( $entry, $form ) {
606
+		/**
607
+		 * @filter `gravityview_custom_entry_slug` On entry creation, check if we are using the custom entry slug feature and update the meta
608
+		 * @param boolean $custom Should we process the custom entry slug?
609
+		 */
610
+		$custom = apply_filters( 'gravityview_custom_entry_slug', false );
611
+		if( $custom ) {
612
+			// create the gravityview_unique_id and save it
613 613
 
614
-            // Get the entry hash
615
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
614
+			// Get the entry hash
615
+			$hash = self::get_custom_entry_slug( $entry['id'], $entry );
616 616
 
617
-	        do_action( 'gravityview_log_debug', __METHOD__ . ' - Setting hash for entry "'.$entry['id'].'": ' . $hash );
617
+			do_action( 'gravityview_log_debug', __METHOD__ . ' - Setting hash for entry "'.$entry['id'].'": ' . $hash );
618 618
 
619
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, rgar( $entry, 'form_id' ) );
619
+			gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, rgar( $entry, 'form_id' ) );
620 620
 
621
-        }
622
-    }
621
+		}
622
+	}
623 623
 
624 624
 
625 625
 
@@ -895,7 +895,7 @@  discard block
 block discarded – undo
895 895
 
896 896
 			// If there was an error, continue to the next term.
897 897
 			if ( is_wp_error( $term_link ) ) {
898
-			    continue;
898
+				continue;
899 899
 			}
900 900
 
901 901
 			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
Please login to merge, or discard this patch.