@@ -1,15 +1,15 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Set of common functions to separate main plugin from Gravity Forms API and other cross-plugin methods |
|
| 4 | - * |
|
| 5 | - * @package GravityView |
|
| 6 | - * @license GPL2+ |
|
| 7 | - * @author Katz Web Services, Inc. |
|
| 8 | - * @link http://gravityview.co |
|
| 9 | - * @copyright Copyright 2014, Katz Web Services, Inc. |
|
| 10 | - * |
|
| 11 | - * @since 1.5.2 |
|
| 12 | - */ |
|
| 3 | + * Set of common functions to separate main plugin from Gravity Forms API and other cross-plugin methods |
|
| 4 | + * |
|
| 5 | + * @package GravityView |
|
| 6 | + * @license GPL2+ |
|
| 7 | + * @author Katz Web Services, Inc. |
|
| 8 | + * @link http://gravityview.co |
|
| 9 | + * @copyright Copyright 2014, Katz Web Services, Inc. |
|
| 10 | + * |
|
| 11 | + * @since 1.5.2 |
|
| 12 | + */ |
|
| 13 | 13 | |
| 14 | 14 | /** If this file is called directly, abort. */ |
| 15 | 15 | if ( ! defined( 'ABSPATH' ) ) { |
@@ -240,13 +240,13 @@ discard block |
||
| 240 | 240 | |
| 241 | 241 | if ( $add_default_properties && ! empty( $field['inputs'] ) ) { |
| 242 | 242 | foreach ( $field['inputs'] as $input ) { |
| 243 | - /** |
|
| 244 | - * @hack |
|
| 245 | - * In case of email/email confirmation, the input for email has the same id as the parent field |
|
| 246 | - */ |
|
| 247 | - if( 'email' == rgar( $field, 'type' ) && false === strpos( $input['id'], '.' ) ) { |
|
| 248 | - continue; |
|
| 249 | - } |
|
| 243 | + /** |
|
| 244 | + * @hack |
|
| 245 | + * In case of email/email confirmation, the input for email has the same id as the parent field |
|
| 246 | + */ |
|
| 247 | + if( 'email' == rgar( $field, 'type' ) && false === strpos( $input['id'], '.' ) ) { |
|
| 248 | + continue; |
|
| 249 | + } |
|
| 250 | 250 | $fields[ (string)$input['id'] ] = array( |
| 251 | 251 | 'label' => rgar( $input, 'label' ), |
| 252 | 252 | 'customLabel' => rgar( $input, 'customLabel' ), |
@@ -469,7 +469,7 @@ discard block |
||
| 469 | 469 | } elseif ( 'delete' === RGForms::get( 'action' ) ) { |
| 470 | 470 | $criteria['context_view_id'] = isset( $_GET['view_id'] ) ? $_GET['view_id'] : null; |
| 471 | 471 | } elseif( !isset( $criteria['context_view_id'] ) ) { |
| 472 | - // Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget) |
|
| 472 | + // Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget) |
|
| 473 | 473 | $criteria['context_view_id'] = null; |
| 474 | 474 | } |
| 475 | 475 | |
@@ -1168,7 +1168,7 @@ discard block |
||
| 1168 | 1168 | ), |
| 1169 | 1169 | ); |
| 1170 | 1170 | |
| 1171 | - $fields = $date_created + $fields; |
|
| 1171 | + $fields = $date_created + $fields; |
|
| 1172 | 1172 | |
| 1173 | 1173 | $blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL ); |
| 1174 | 1174 | |
@@ -1180,13 +1180,13 @@ discard block |
||
| 1180 | 1180 | } |
| 1181 | 1181 | } |
| 1182 | 1182 | |
| 1183 | - /** |
|
| 1184 | - * @filter `gravityview/common/sortable_fields` Filter the sortable fields |
|
| 1185 | - * @since 1.12 |
|
| 1186 | - * @param array $fields Sub-set of GF form fields that are sortable |
|
| 1187 | - * @param int $formid The Gravity Forms form ID that the fields are from |
|
| 1188 | - */ |
|
| 1189 | - $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid ); |
|
| 1183 | + /** |
|
| 1184 | + * @filter `gravityview/common/sortable_fields` Filter the sortable fields |
|
| 1185 | + * @since 1.12 |
|
| 1186 | + * @param array $fields Sub-set of GF form fields that are sortable |
|
| 1187 | + * @param int $formid The Gravity Forms form ID that the fields are from |
|
| 1188 | + */ |
|
| 1189 | + $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid ); |
|
| 1190 | 1190 | |
| 1191 | 1191 | return $fields; |
| 1192 | 1192 | } |
@@ -1464,17 +1464,17 @@ discard block |
||
| 1464 | 1464 | } |
| 1465 | 1465 | |
| 1466 | 1466 | |
| 1467 | - /** |
|
| 1468 | - * Display updated/error notice |
|
| 1469 | - * |
|
| 1470 | - * @param string $notice text/HTML of notice |
|
| 1471 | - * @param string $class CSS class for notice (`updated` or `error`) |
|
| 1472 | - * |
|
| 1473 | - * @return string |
|
| 1474 | - */ |
|
| 1475 | - public static function generate_notice( $notice, $class = '' ) { |
|
| 1476 | - return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>'; |
|
| 1477 | - } |
|
| 1467 | + /** |
|
| 1468 | + * Display updated/error notice |
|
| 1469 | + * |
|
| 1470 | + * @param string $notice text/HTML of notice |
|
| 1471 | + * @param string $class CSS class for notice (`updated` or `error`) |
|
| 1472 | + * |
|
| 1473 | + * @return string |
|
| 1474 | + */ |
|
| 1475 | + public static function generate_notice( $notice, $class = '' ) { |
|
| 1476 | + return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>'; |
|
| 1477 | + } |
|
| 1478 | 1478 | |
| 1479 | 1479 | |
| 1480 | 1480 | |