@@ -305,12 +305,12 @@ discard block |
||
| 305 | 305 | } |
| 306 | 306 | |
| 307 | 307 | /** |
| 308 | - * @hack |
|
| 309 | - * In case of email/email confirmation, the input for email has the same id as the parent field |
|
| 310 | - */ |
|
| 308 | + * @hack |
|
| 309 | + * In case of email/email confirmation, the input for email has the same id as the parent field |
|
| 310 | + */ |
|
| 311 | 311 | if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) { |
| 312 | - continue; |
|
| 313 | - } |
|
| 312 | + continue; |
|
| 313 | + } |
|
| 314 | 314 | $fields["{$input['id']}"] = array( |
| 315 | 315 | 'label' => \GV\Utils::get( $input, 'label' ), |
| 316 | 316 | 'customLabel' => \GV\Utils::get( $input, 'customLabel' ), |
@@ -1349,7 +1349,7 @@ discard block |
||
| 1349 | 1349 | ), |
| 1350 | 1350 | ); |
| 1351 | 1351 | |
| 1352 | - $fields = $date_created + $fields; |
|
| 1352 | + $fields = $date_created + $fields; |
|
| 1353 | 1353 | |
| 1354 | 1354 | $blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL ); |
| 1355 | 1355 | |
@@ -1361,13 +1361,13 @@ discard block |
||
| 1361 | 1361 | } |
| 1362 | 1362 | } |
| 1363 | 1363 | |
| 1364 | - /** |
|
| 1365 | - * @filter `gravityview/common/sortable_fields` Filter the sortable fields |
|
| 1366 | - * @since 1.12 |
|
| 1367 | - * @param array $fields Sub-set of GF form fields that are sortable |
|
| 1368 | - * @param int $formid The Gravity Forms form ID that the fields are from |
|
| 1369 | - */ |
|
| 1370 | - $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid ); |
|
| 1364 | + /** |
|
| 1365 | + * @filter `gravityview/common/sortable_fields` Filter the sortable fields |
|
| 1366 | + * @since 1.12 |
|
| 1367 | + * @param array $fields Sub-set of GF form fields that are sortable |
|
| 1368 | + * @param int $formid The Gravity Forms form ID that the fields are from |
|
| 1369 | + */ |
|
| 1370 | + $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid ); |
|
| 1371 | 1371 | |
| 1372 | 1372 | return $fields; |
| 1373 | 1373 | } |
@@ -1659,26 +1659,26 @@ discard block |
||
| 1659 | 1659 | } |
| 1660 | 1660 | |
| 1661 | 1661 | |
| 1662 | - /** |
|
| 1663 | - * Display updated/error notice |
|
| 1664 | - * |
|
| 1665 | - * @since 1.19.2 Added $cap and $object_id parameters |
|
| 1666 | - * |
|
| 1667 | - * @param string $notice text/HTML of notice |
|
| 1668 | - * @param string $class CSS class for notice (`updated` or `error`) |
|
| 1669 | - * @param string $cap [Optional] Define a capability required to show a notice. If not set, displays to all caps. |
|
| 1670 | - * |
|
| 1671 | - * @return string |
|
| 1672 | - */ |
|
| 1673 | - public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) { |
|
| 1674 | - |
|
| 1675 | - // If $cap is defined, only show notice if user has capability |
|
| 1676 | - if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) { |
|
| 1677 | - return ''; |
|
| 1678 | - } |
|
| 1679 | - |
|
| 1680 | - return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>'; |
|
| 1681 | - } |
|
| 1662 | + /** |
|
| 1663 | + * Display updated/error notice |
|
| 1664 | + * |
|
| 1665 | + * @since 1.19.2 Added $cap and $object_id parameters |
|
| 1666 | + * |
|
| 1667 | + * @param string $notice text/HTML of notice |
|
| 1668 | + * @param string $class CSS class for notice (`updated` or `error`) |
|
| 1669 | + * @param string $cap [Optional] Define a capability required to show a notice. If not set, displays to all caps. |
|
| 1670 | + * |
|
| 1671 | + * @return string |
|
| 1672 | + */ |
|
| 1673 | + public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) { |
|
| 1674 | + |
|
| 1675 | + // If $cap is defined, only show notice if user has capability |
|
| 1676 | + if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) { |
|
| 1677 | + return ''; |
|
| 1678 | + } |
|
| 1679 | + |
|
| 1680 | + return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>'; |
|
| 1681 | + } |
|
| 1682 | 1682 | |
| 1683 | 1683 | /** |
| 1684 | 1684 | * Inspired on \GFCommon::encode_shortcodes, reverse the encoding by replacing the ascii characters by the shortcode brackets |