@@ -310,12 +310,12 @@ discard block |
||
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | /** |
| 313 | - * @hack |
|
| 314 | - * In case of email/email confirmation, the input for email has the same id as the parent field |
|
| 315 | - */ |
|
| 313 | + * @hack |
|
| 314 | + * In case of email/email confirmation, the input for email has the same id as the parent field |
|
| 315 | + */ |
|
| 316 | 316 | if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) { |
| 317 | - continue; |
|
| 318 | - } |
|
| 317 | + continue; |
|
| 318 | + } |
|
| 319 | 319 | $fields["{$input['id']}"] = array( |
| 320 | 320 | 'label' => \GV\Utils::get( $input, 'label' ), |
| 321 | 321 | 'customLabel' => \GV\Utils::get( $input, 'customLabel' ), |
@@ -1488,7 +1488,7 @@ discard block |
||
| 1488 | 1488 | ), |
| 1489 | 1489 | ); |
| 1490 | 1490 | |
| 1491 | - $fields = $date_created + $fields; |
|
| 1491 | + $fields = $date_created + $fields; |
|
| 1492 | 1492 | |
| 1493 | 1493 | $blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL ); |
| 1494 | 1494 | |
@@ -1516,13 +1516,13 @@ discard block |
||
| 1516 | 1516 | |
| 1517 | 1517 | } |
| 1518 | 1518 | |
| 1519 | - /** |
|
| 1520 | - * @filter `gravityview/common/sortable_fields` Filter the sortable fields |
|
| 1521 | - * @since 1.12 |
|
| 1522 | - * @param array $fields Sub-set of GF form fields that are sortable |
|
| 1523 | - * @param int $formid The Gravity Forms form ID that the fields are from |
|
| 1524 | - */ |
|
| 1525 | - $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid ); |
|
| 1519 | + /** |
|
| 1520 | + * @filter `gravityview/common/sortable_fields` Filter the sortable fields |
|
| 1521 | + * @since 1.12 |
|
| 1522 | + * @param array $fields Sub-set of GF form fields that are sortable |
|
| 1523 | + * @param int $formid The Gravity Forms form ID that the fields are from |
|
| 1524 | + */ |
|
| 1525 | + $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid ); |
|
| 1526 | 1526 | |
| 1527 | 1527 | return $fields; |
| 1528 | 1528 | } |
@@ -1814,26 +1814,26 @@ discard block |
||
| 1814 | 1814 | } |
| 1815 | 1815 | |
| 1816 | 1816 | |
| 1817 | - /** |
|
| 1818 | - * Display updated/error notice |
|
| 1819 | - * |
|
| 1820 | - * @since 1.19.2 Added $cap and $object_id parameters |
|
| 1821 | - * |
|
| 1822 | - * @param string $notice text/HTML of notice |
|
| 1823 | - * @param string $class CSS class for notice (`updated` or `error`) |
|
| 1824 | - * @param string $cap [Optional] Define a capability required to show a notice. If not set, displays to all caps. |
|
| 1825 | - * |
|
| 1826 | - * @return string |
|
| 1827 | - */ |
|
| 1828 | - public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) { |
|
| 1829 | - |
|
| 1830 | - // If $cap is defined, only show notice if user has capability |
|
| 1831 | - if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) { |
|
| 1832 | - return ''; |
|
| 1833 | - } |
|
| 1834 | - |
|
| 1835 | - return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>'; |
|
| 1836 | - } |
|
| 1817 | + /** |
|
| 1818 | + * Display updated/error notice |
|
| 1819 | + * |
|
| 1820 | + * @since 1.19.2 Added $cap and $object_id parameters |
|
| 1821 | + * |
|
| 1822 | + * @param string $notice text/HTML of notice |
|
| 1823 | + * @param string $class CSS class for notice (`updated` or `error`) |
|
| 1824 | + * @param string $cap [Optional] Define a capability required to show a notice. If not set, displays to all caps. |
|
| 1825 | + * |
|
| 1826 | + * @return string |
|
| 1827 | + */ |
|
| 1828 | + public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) { |
|
| 1829 | + |
|
| 1830 | + // If $cap is defined, only show notice if user has capability |
|
| 1831 | + if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) { |
|
| 1832 | + return ''; |
|
| 1833 | + } |
|
| 1834 | + |
|
| 1835 | + return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>'; |
|
| 1836 | + } |
|
| 1837 | 1837 | |
| 1838 | 1838 | /** |
| 1839 | 1839 | * Inspired on \GFCommon::encode_shortcodes, reverse the encoding by replacing the ascii characters by the shortcode brackets |