@@ -267,7 +267,7 @@ |
||
| 267 | 267 | * Add 'closed' class to metabox |
| 268 | 268 | * @since 2.0.0 |
| 269 | 269 | * @param array $classes Array of classes |
| 270 | - * @return array Modified array of classes |
|
| 270 | + * @return string[] Modified array of classes |
|
| 271 | 271 | */ |
| 272 | 272 | public function close_metabox_class( $classes ) { |
| 273 | 273 | $classes[] = 'closed'; |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | |
| 120 | 120 | if ( $this->cmb->has_columns ) { |
| 121 | 121 | add_filter( 'manage_edit-comments_columns', array( $this, 'register_column_headers' ) ); |
| 122 | - add_action( 'manage_comments_custom_column', array( $this, 'column_display' ), 10, 3 ); |
|
| 122 | + add_action( 'manage_comments_custom_column', array( $this, 'column_display' ), 10, 3 ); |
|
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | |
| 137 | 137 | if ( $this->cmb->has_columns ) { |
| 138 | 138 | add_filter( 'manage_users_columns', array( $this, 'register_column_headers' ) ); |
| 139 | - add_filter( 'manage_users_custom_column', array( $this, 'return_column_display' ), 10, 3 ); |
|
| 139 | + add_filter( 'manage_users_custom_column', array( $this, 'return_column_display' ), 10, 3 ); |
|
| 140 | 140 | } |
| 141 | 141 | } |
| 142 | 142 | |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | |
| 171 | 171 | if ( $this->cmb->has_columns ) { |
| 172 | 172 | add_filter( "manage_edit-{$taxonomy}_columns", array( $this, 'register_column_headers' ) ); |
| 173 | - add_filter( "manage_{$taxonomy}_custom_column", array( $this, 'return_column_display' ), 10, 3 ); |
|
| 173 | + add_filter( "manage_{$taxonomy}_custom_column", array( $this, 'return_column_display' ), 10, 3 ); |
|
| 174 | 174 | } |
| 175 | 175 | } |
| 176 | 176 | |
@@ -263,25 +263,25 @@ discard block |
||
| 263 | 263 | $fields = $this->cmb->prop( 'fields' ); |
| 264 | 264 | |
| 265 | 265 | foreach ( $fields as $key => $field ) { |
| 266 | - if ( ! isset( $field['column'] ) ) { |
|
| 266 | + if ( ! isset( $field[ 'column' ] ) ) { |
|
| 267 | 267 | continue; |
| 268 | 268 | } |
| 269 | 269 | |
| 270 | - $column = $field['column']; |
|
| 270 | + $column = $field[ 'column' ]; |
|
| 271 | 271 | |
| 272 | - if ( false === $column['position'] ) { |
|
| 272 | + if ( false === $column[ 'position' ] ) { |
|
| 273 | 273 | |
| 274 | - $columns[ $field['id'] ] = $column['name']; |
|
| 274 | + $columns[ $field[ 'id' ] ] = $column[ 'name' ]; |
|
| 275 | 275 | |
| 276 | 276 | } else { |
| 277 | 277 | |
| 278 | - $before = array_slice( $columns, 0, absint( $column['position'] ) ); |
|
| 279 | - $before[ $field['id'] ] = $column['name']; |
|
| 278 | + $before = array_slice( $columns, 0, absint( $column[ 'position' ] ) ); |
|
| 279 | + $before[ $field[ 'id' ] ] = $column[ 'name' ]; |
|
| 280 | 280 | $columns = $before + $columns; |
| 281 | 281 | } |
| 282 | 282 | |
| 283 | - $column['field'] = $field; |
|
| 284 | - $this->columns[ $field['id'] ] = $column; |
|
| 283 | + $column[ 'field' ] = $field; |
|
| 284 | + $this->columns[ $field[ 'id' ] ] = $column; |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | return $columns; |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | public function column_display( $column_name, $object_id ) { |
| 295 | 295 | if ( isset( $this->columns[ $column_name ] ) ) { |
| 296 | 296 | $field = new CMB2_Field( array( |
| 297 | - 'field_args' => $this->columns[ $column_name ]['field'], |
|
| 297 | + 'field_args' => $this->columns[ $column_name ][ 'field' ], |
|
| 298 | 298 | 'object_type' => $this->object_type, |
| 299 | 299 | 'object_id' => $this->cmb->object_id( $object_id ), |
| 300 | 300 | 'cmb_id' => $this->cmb->cmb_id, |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | * @return array Modified array of classes |
| 356 | 356 | */ |
| 357 | 357 | public function close_metabox_class( $classes ) { |
| 358 | - $classes[] = 'closed'; |
|
| 358 | + $classes[ ] = 'closed'; |
|
| 359 | 359 | return $classes; |
| 360 | 360 | } |
| 361 | 361 | |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | public function user_new_metabox( $section ) { |
| 376 | 376 | if ( $section == $this->cmb->prop( 'new_user_section' ) ) { |
| 377 | 377 | $object_id = $this->cmb->object_id(); |
| 378 | - $this->cmb->object_id( isset( $_REQUEST['user_id'] ) ? $_REQUEST['user_id'] : $object_id ); |
|
| 378 | + $this->cmb->object_id( isset( $_REQUEST[ 'user_id' ] ) ? $_REQUEST[ 'user_id' ] : $object_id ); |
|
| 379 | 379 | $this->user_metabox(); |
| 380 | 380 | } |
| 381 | 381 | } |
@@ -555,7 +555,7 @@ discard block |
||
| 555 | 555 | if ( $this->taxonomy_can_save( $taxonomy ) ) { |
| 556 | 556 | |
| 557 | 557 | foreach ( $this->cmb->prop( 'fields' ) as $field ) { |
| 558 | - $data_to_delete[ $field['id'] ] = ''; |
|
| 558 | + $data_to_delete[ $field[ 'id' ] ] = ''; |
|
| 559 | 559 | } |
| 560 | 560 | |
| 561 | 561 | $this->cmb->save_fields( $term_id, 'term', $data_to_delete ); |
@@ -357,6 +357,7 @@ discard block |
||
| 357 | 357 | /** |
| 358 | 358 | * Gets the values for the `file` field type from the data being saved. |
| 359 | 359 | * @since 2.2.0 |
| 360 | + * @param string $id_key |
|
| 360 | 361 | */ |
| 361 | 362 | public function _get_group_file_value_array( $id_key ) { |
| 362 | 363 | $alldata = $this->field->group->data_to_save; |
@@ -378,6 +379,7 @@ discard block |
||
| 378 | 379 | /** |
| 379 | 380 | * Peforms saving of `file` attachement's ID |
| 380 | 381 | * @since 1.1.0 |
| 382 | + * @param string $file_id_key |
|
| 381 | 383 | */ |
| 382 | 384 | public function _save_file_id_value( $file_id_key ) { |
| 383 | 385 | $id_field = $this->_new_supporting_field( $file_id_key ); |
@@ -398,6 +400,7 @@ discard block |
||
| 398 | 400 | /** |
| 399 | 401 | * Peforms saving of `text_datetime_timestamp_timezone` utc timestamp |
| 400 | 402 | * @since 2.2.0 |
| 403 | + * @param string $utc_key |
|
| 401 | 404 | */ |
| 402 | 405 | public function _save_utc_value( $utc_key, $utc_stamp ) { |
| 403 | 406 | return $this->_new_supporting_field( $utc_key )->save_field( $utc_stamp ); |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | |
| 173 | 173 | global $wp_locale; |
| 174 | 174 | |
| 175 | - $search = array( $wp_locale->number_format['thousands_sep'], $wp_locale->number_format['decimal_point'] ); |
|
| 175 | + $search = array( $wp_locale->number_format[ 'thousands_sep' ], $wp_locale->number_format[ 'decimal_point' ] ); |
|
| 176 | 176 | $replace = array( '', '.' ); |
| 177 | 177 | |
| 178 | 178 | // for repeatable |
@@ -215,8 +215,8 @@ discard block |
||
| 215 | 215 | return $repeat_value; |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | - if ( isset( $this->value['date'], $this->value['time'] ) ) { |
|
| 219 | - $this->value = $this->field->get_timestamp_from_value( $this->value['date'] . ' ' . $this->value['time'] ); |
|
| 218 | + if ( isset( $this->value[ 'date' ], $this->value[ 'time' ] ) ) { |
|
| 219 | + $this->value = $this->field->get_timestamp_from_value( $this->value[ 'date' ] . ' ' . $this->value[ 'time' ] ); |
|
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | if ( $tz_offset = $this->field->field_timezone_offset() ) { |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | $tzstring = null; |
| 255 | 255 | |
| 256 | 256 | if ( is_array( $this->value ) && array_key_exists( 'timezone', $this->value ) ) { |
| 257 | - $tzstring = $this->value['timezone']; |
|
| 257 | + $tzstring = $this->value[ 'timezone' ]; |
|
| 258 | 258 | } |
| 259 | 259 | |
| 260 | 260 | if ( empty( $tzstring ) ) { |
@@ -274,8 +274,8 @@ discard block |
||
| 274 | 274 | $tzstring = false !== $tzstring ? $tzstring : timezone_name_from_abbr( '', 0, 0 ); |
| 275 | 275 | } |
| 276 | 276 | |
| 277 | - $full_format = $this->field->args['date_format'] . ' ' . $this->field->args['time_format']; |
|
| 278 | - $full_date = $this->value['date'] . ' ' . $this->value['time']; |
|
| 277 | + $full_format = $this->field->args[ 'date_format' ] . ' ' . $this->field->args[ 'time_format' ]; |
|
| 278 | + $full_date = $this->value[ 'date' ] . ' ' . $this->value[ 'time' ]; |
|
| 279 | 279 | |
| 280 | 280 | try { |
| 281 | 281 | |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | } else { |
| 299 | 299 | // Save the utc timestamp supporting field |
| 300 | 300 | if ( $repeat ) { |
| 301 | - $utc_values[ $utc_key ][] = $utc_stamp; |
|
| 301 | + $utc_values[ $utc_key ][ ] = $utc_stamp; |
|
| 302 | 302 | } else { |
| 303 | 303 | $this->_save_utc_value( $utc_key, $utc_stamp ); |
| 304 | 304 | } |
@@ -433,7 +433,7 @@ discard block |
||
| 433 | 433 | if ( $this->value ) { |
| 434 | 434 | $val = $this->$method( true ); |
| 435 | 435 | if ( ! empty( $val ) ) { |
| 436 | - $new_value[] = $val; |
|
| 436 | + $new_value[ ] = $val; |
|
| 437 | 437 | } |
| 438 | 438 | } |
| 439 | 439 | } |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | $cmb_demo = new_cmb2_box( array( |
| 79 | 79 | 'id' => $prefix . 'metabox', |
| 80 | 80 | 'title' => __( 'Test Metabox', 'cmb2' ), |
| 81 | - 'object_types' => array( 'page', ), // Post type |
|
| 81 | + 'object_types' => array( 'page',), // Post type |
|
| 82 | 82 | // 'show_on_cb' => 'yourprefix_show_if_front_page', // function should return a bool value |
| 83 | 83 | // 'context' => 'normal', |
| 84 | 84 | // 'priority' => 'high', |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | 'desc' => __( 'field description (optional)', 'cmb2' ), |
| 330 | 330 | 'id' => $prefix . 'wysiwyg', |
| 331 | 331 | 'type' => 'wysiwyg', |
| 332 | - 'options' => array( 'textarea_rows' => 5, ), |
|
| 332 | + 'options' => array( 'textarea_rows' => 5,), |
|
| 333 | 333 | ) ); |
| 334 | 334 | |
| 335 | 335 | $cmb_demo->add_field( array( |
@@ -381,11 +381,11 @@ discard block |
||
| 381 | 381 | $cmb_about_page = new_cmb2_box( array( |
| 382 | 382 | 'id' => $prefix . 'metabox', |
| 383 | 383 | 'title' => __( 'About Page Metabox', 'cmb2' ), |
| 384 | - 'object_types' => array( 'page', ), // Post type |
|
| 384 | + 'object_types' => array( 'page',), // Post type |
|
| 385 | 385 | 'context' => 'normal', |
| 386 | 386 | 'priority' => 'high', |
| 387 | 387 | 'show_names' => true, // Show field names on the left |
| 388 | - 'show_on' => array( 'id' => array( 2, ) ), // Specific post IDs to display this metabox |
|
| 388 | + 'show_on' => array( 'id' => array( 2,) ), // Specific post IDs to display this metabox |
|
| 389 | 389 | ) ); |
| 390 | 390 | |
| 391 | 391 | $cmb_about_page->add_field( array( |
@@ -410,7 +410,7 @@ discard block |
||
| 410 | 410 | $cmb_group = new_cmb2_box( array( |
| 411 | 411 | 'id' => $prefix . 'metabox', |
| 412 | 412 | 'title' => __( 'Repeating Field Group', 'cmb2' ), |
| 413 | - 'object_types' => array( 'page', ), |
|
| 413 | + 'object_types' => array( 'page',), |
|
| 414 | 414 | ) ); |
| 415 | 415 | |
| 416 | 416 | // $group_field_id is the field id string, so in this case: $prefix . 'demo' |
@@ -51,17 +51,17 @@ |
||
| 51 | 51 | $dependencies = apply_filters( 'cmb2_script_dependencies', self::$dependencies ); |
| 52 | 52 | |
| 53 | 53 | // if colorpicker |
| 54 | - if ( ! is_admin() && isset( $dependencies['wp-color-picker'] ) ) { |
|
| 54 | + if ( ! is_admin() && isset( $dependencies[ 'wp-color-picker' ] ) ) { |
|
| 55 | 55 | self::colorpicker_frontend(); |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | // if file/file_list |
| 59 | - if ( isset( $dependencies['media-editor'] ) ) { |
|
| 59 | + if ( isset( $dependencies[ 'media-editor' ] ) ) { |
|
| 60 | 60 | wp_enqueue_media(); |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | // if timepicker |
| 64 | - if ( isset( $dependencies['jquery-ui-datetimepicker'] ) ) { |
|
| 64 | + if ( isset( $dependencies[ 'jquery-ui-datetimepicker' ] ) ) { |
|
| 65 | 65 | wp_register_script( 'jquery-ui-datetimepicker', cmb2_utils()->url( 'js/jquery-ui-timepicker-addon.min.js' ), array( 'jquery-ui-slider' ), CMB2_VERSION ); |
| 66 | 66 | } |
| 67 | 67 | |
@@ -131,7 +131,7 @@ |
||
| 131 | 131 | |
| 132 | 132 | if ( ! $single ) { |
| 133 | 133 | // If multiple, add to array |
| 134 | - $this->options[ $field_id ][] = $value; |
|
| 134 | + $this->options[ $field_id ][ ] = $value; |
|
| 135 | 135 | } else { |
| 136 | 136 | $this->options[ $field_id ] = $value; |
| 137 | 137 | } |
@@ -27,15 +27,15 @@ discard block |
||
| 27 | 27 | * @return mixed show_on key or false |
| 28 | 28 | */ |
| 29 | 29 | private static function get_show_on_key( $meta_box_args ) { |
| 30 | - $show_on = isset( $meta_box_args['show_on'] ) ? (array) $meta_box_args['show_on'] : false; |
|
| 30 | + $show_on = isset( $meta_box_args[ 'show_on' ] ) ? (array) $meta_box_args[ 'show_on' ] : false; |
|
| 31 | 31 | if ( $show_on && is_array( $show_on ) ) { |
| 32 | 32 | |
| 33 | 33 | if ( array_key_exists( 'key', $show_on ) ) { |
| 34 | - return $show_on['key']; |
|
| 34 | + return $show_on[ 'key' ]; |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | $keys = array_keys( $show_on ); |
| 38 | - return $keys[0]; |
|
| 38 | + return $keys[ 0 ]; |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | return false; |
@@ -51,17 +51,17 @@ discard block |
||
| 51 | 51 | * @return mixed show_on value or false |
| 52 | 52 | */ |
| 53 | 53 | private static function get_show_on_value( $meta_box_args ) { |
| 54 | - $show_on = isset( $meta_box_args['show_on'] ) ? (array) $meta_box_args['show_on'] : false; |
|
| 54 | + $show_on = isset( $meta_box_args[ 'show_on' ] ) ? (array) $meta_box_args[ 'show_on' ] : false; |
|
| 55 | 55 | |
| 56 | 56 | if ( $show_on && is_array( $show_on ) ) { |
| 57 | 57 | |
| 58 | 58 | if ( array_key_exists( 'value', $show_on ) ) { |
| 59 | - return $show_on['value']; |
|
| 59 | + return $show_on[ 'value' ]; |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | $keys = array_keys( $show_on ); |
| 63 | 63 | |
| 64 | - return $show_on[ $keys[0] ]; |
|
| 64 | + return $show_on[ $keys[ 0 ] ]; |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | return array(); |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | if ( is_admin() ) { |
| 142 | 142 | |
| 143 | 143 | // If there is no 'page' query var, our filter isn't applicable |
| 144 | - if ( ! isset( $_GET['page'] ) ) { |
|
| 144 | + if ( ! isset( $_GET[ 'page' ] ) ) { |
|
| 145 | 145 | return $display; |
| 146 | 146 | } |
| 147 | 147 | |
@@ -153,12 +153,12 @@ discard block |
||
| 153 | 153 | |
| 154 | 154 | if ( is_array( $show_on ) ) { |
| 155 | 155 | foreach ( $show_on as $page ) { |
| 156 | - if ( $_GET['page'] == $page ) { |
|
| 156 | + if ( $_GET[ 'page' ] == $page ) { |
|
| 157 | 157 | return true; |
| 158 | 158 | } |
| 159 | 159 | } |
| 160 | 160 | } else { |
| 161 | - if ( $_GET['page'] == $show_on ) { |
|
| 161 | + if ( $_GET[ 'page' ] == $show_on ) { |
|
| 162 | 162 | return true; |
| 163 | 163 | } |
| 164 | 164 | } |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | /** |
| 31 | 31 | * Get the singleton instance of this class |
| 32 | 32 | * @since 2.2.2 |
| 33 | - * @return object |
|
| 33 | + * @return CMB2_Ajax |
|
| 34 | 34 | */ |
| 35 | 35 | public static function get_instance() { |
| 36 | 36 | if ( ! ( self::$instance instanceof self ) ) { |
@@ -221,7 +221,6 @@ discard block |
||
| 221 | 221 | * |
| 222 | 222 | * @since 1.3.0 |
| 223 | 223 | * @param string $meta_key Postmeta's key |
| 224 | - * @param mixed $meta_value (Optional) value of the postmeta to be saved |
|
| 225 | 224 | */ |
| 226 | 225 | protected function cache_action( $meta_key ) { |
| 227 | 226 | $func_args = func_get_args(); |
@@ -59,12 +59,12 @@ discard block |
||
| 59 | 59 | public function oembed_handler() { |
| 60 | 60 | |
| 61 | 61 | // Verify our nonce |
| 62 | - if ( ! ( isset( $_REQUEST['cmb2_ajax_nonce'], $_REQUEST['oembed_url'] ) && wp_verify_nonce( $_REQUEST['cmb2_ajax_nonce'], 'ajax_nonce' ) ) ) { |
|
| 62 | + if ( ! ( isset( $_REQUEST[ 'cmb2_ajax_nonce' ], $_REQUEST[ 'oembed_url' ] ) && wp_verify_nonce( $_REQUEST[ 'cmb2_ajax_nonce' ], 'ajax_nonce' ) ) ) { |
|
| 63 | 63 | die(); |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | // Sanitize our search string |
| 67 | - $oembed_string = sanitize_text_field( $_REQUEST['oembed_url'] ); |
|
| 67 | + $oembed_string = sanitize_text_field( $_REQUEST[ 'oembed_url' ] ); |
|
| 68 | 68 | |
| 69 | 69 | // Send back error if empty |
| 70 | 70 | if ( empty( $oembed_string ) ) { |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | // Set width of embed |
| 75 | - $embed_width = isset( $_REQUEST['oembed_width'] ) && intval( $_REQUEST['oembed_width'] ) < 640 ? intval( $_REQUEST['oembed_width'] ) : '640'; |
|
| 75 | + $embed_width = isset( $_REQUEST[ 'oembed_width' ] ) && intval( $_REQUEST[ 'oembed_width' ] ) < 640 ? intval( $_REQUEST[ 'oembed_width' ] ) : '640'; |
|
| 76 | 76 | |
| 77 | 77 | // Set url |
| 78 | 78 | $oembed_url = esc_url( $oembed_string ); |
@@ -85,10 +85,10 @@ discard block |
||
| 85 | 85 | // Get embed code (or fallback link) |
| 86 | 86 | $html = $this->get_oembed( array( |
| 87 | 87 | 'url' => $oembed_url, |
| 88 | - 'object_id' => $_REQUEST['object_id'], |
|
| 89 | - 'object_type' => isset( $_REQUEST['object_type'] ) ? $_REQUEST['object_type'] : 'post', |
|
| 88 | + 'object_id' => $_REQUEST[ 'object_id' ], |
|
| 89 | + 'object_type' => isset( $_REQUEST[ 'object_type' ] ) ? $_REQUEST[ 'object_type' ] : 'post', |
|
| 90 | 90 | 'oembed_args' => $embed_args, |
| 91 | - 'field_id' => $_REQUEST['field_id'], |
|
| 91 | + 'field_id' => $_REQUEST[ 'field_id' ], |
|
| 92 | 92 | ) ); |
| 93 | 93 | |
| 94 | 94 | wp_send_json_success( $html ); |
@@ -103,10 +103,10 @@ discard block |
||
| 103 | 103 | public function get_oembed_no_edit( $args ) { |
| 104 | 104 | global $wp_embed; |
| 105 | 105 | |
| 106 | - $oembed_url = esc_url( $args['url'] ); |
|
| 106 | + $oembed_url = esc_url( $args[ 'url' ] ); |
|
| 107 | 107 | |
| 108 | 108 | // Sanitize object_id |
| 109 | - $this->object_id = is_numeric( $args['object_id'] ) ? absint( $args['object_id'] ) : sanitize_text_field( $args['object_id'] ); |
|
| 109 | + $this->object_id = is_numeric( $args[ 'object_id' ] ) ? absint( $args[ 'object_id' ] ) : sanitize_text_field( $args[ 'object_id' ] ); |
|
| 110 | 110 | |
| 111 | 111 | $args = wp_parse_args( $args, array( |
| 112 | 112 | 'object_type' => 'post', |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | 'wp_error' => false, |
| 116 | 116 | ) ); |
| 117 | 117 | |
| 118 | - $this->embed_args =& $args; |
|
| 118 | + $this->embed_args = & $args; |
|
| 119 | 119 | |
| 120 | 120 | /** |
| 121 | 121 | * Set the post_ID so oEmbed won't fail |
@@ -124,9 +124,9 @@ discard block |
||
| 124 | 124 | $wp_embed->post_ID = $this->object_id; |
| 125 | 125 | |
| 126 | 126 | // Special scenario if NOT a post object |
| 127 | - if ( isset( $args['object_type'] ) && 'post' != $args['object_type'] ) { |
|
| 127 | + if ( isset( $args[ 'object_type' ] ) && 'post' != $args[ 'object_type' ] ) { |
|
| 128 | 128 | |
| 129 | - if ( 'options-page' == $args['object_type'] ) { |
|
| 129 | + if ( 'options-page' == $args[ 'object_type' ] ) { |
|
| 130 | 130 | |
| 131 | 131 | // Bogus id to pass some numeric checks. Issue with a VERY large WP install? |
| 132 | 132 | $wp_embed->post_ID = 1987645321; |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | |
| 135 | 135 | // Ok, we need to hijack the oembed cache system |
| 136 | 136 | $this->hijack = true; |
| 137 | - $this->object_type = $args['object_type']; |
|
| 137 | + $this->object_type = $args[ 'object_type' ]; |
|
| 138 | 138 | |
| 139 | 139 | // Gets ombed cache from our object's meta (vs postmeta) |
| 140 | 140 | add_filter( 'get_post_metadata', array( $this, 'hijack_oembed_cache_get' ), 10, 3 ); |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | |
| 147 | 147 | $embed_args = ''; |
| 148 | 148 | |
| 149 | - foreach ( $args['oembed_args'] as $key => $val ) { |
|
| 149 | + foreach ( $args[ 'oembed_args' ] as $key => $val ) { |
|
| 150 | 150 | $embed_args .= " $key=\"$val\""; |
| 151 | 151 | } |
| 152 | 152 | |
@@ -169,12 +169,12 @@ discard block |
||
| 169 | 169 | $oembed = $this->get_oembed_no_edit( $args ); |
| 170 | 170 | |
| 171 | 171 | // Send back our embed |
| 172 | - if ( $oembed['embed'] && $oembed['embed'] != $oembed['fallback'] ) { |
|
| 173 | - return '<div class="cmb2-oembed embed-status">' . $oembed['embed'] . '<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button" rel="' . $oembed['args']['field_id'] . '">' . __( 'Remove Embed', 'cmb2' ) . '</a></p></div>'; |
|
| 172 | + if ( $oembed[ 'embed' ] && $oembed[ 'embed' ] != $oembed[ 'fallback' ] ) { |
|
| 173 | + return '<div class="cmb2-oembed embed-status">' . $oembed[ 'embed' ] . '<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button" rel="' . $oembed[ 'args' ][ 'field_id' ] . '">' . __( 'Remove Embed', 'cmb2' ) . '</a></p></div>'; |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | // Otherwise, send back error info that no oEmbeds were found |
| 177 | - return '<p class="ui-state-error-text">' . sprintf( __( 'No oEmbed Results Found for %s. View more info at', 'cmb2' ), $oembed['fallback'] ) . ' <a href="http://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>.</p>'; |
|
| 177 | + return '<p class="ui-state-error-text">' . sprintf( __( 'No oEmbed Results Found for %s. View more info at', 'cmb2' ), $oembed[ 'fallback' ] ) . ' <a href="http://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>.</p>'; |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | /** |
@@ -236,15 +236,15 @@ discard block |
||
| 236 | 236 | */ |
| 237 | 237 | protected function cache_action( $meta_key ) { |
| 238 | 238 | $func_args = func_get_args(); |
| 239 | - $action = isset( $func_args[1] ) ? 'update' : 'get'; |
|
| 239 | + $action = isset( $func_args[ 1 ] ) ? 'update' : 'get'; |
|
| 240 | 240 | |
| 241 | 241 | if ( 'options-page' === $this->object_type ) { |
| 242 | 242 | |
| 243 | 243 | $args = array( $meta_key ); |
| 244 | 244 | |
| 245 | 245 | if ( 'update' === $action ) { |
| 246 | - $args[] = $func_args[1]; |
|
| 247 | - $args[] = true; |
|
| 246 | + $args[ ] = $func_args[ 1 ]; |
|
| 247 | + $args[ ] = true; |
|
| 248 | 248 | } |
| 249 | 249 | |
| 250 | 250 | // Cache the result to our options |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | } else { |
| 253 | 253 | |
| 254 | 254 | $args = array( $this->object_type, $this->object_id, $meta_key ); |
| 255 | - $args[] = 'update' === $action ? $func_args : true; |
|
| 255 | + $args[ ] = 'update' === $action ? $func_args : true; |
|
| 256 | 256 | |
| 257 | 257 | // Cache the result to our metadata |
| 258 | 258 | $status = call_user_func_array( $action . '_metadata', $args ); |
@@ -84,7 +84,6 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | /** |
| 86 | 86 | * Fall back to CMB2_Types methods |
| 87 | - * @param string $field |
|
| 88 | 87 | * @throws Exception Throws an exception if the field is invalid. |
| 89 | 88 | * @return mixed |
| 90 | 89 | */ |
@@ -105,7 +104,7 @@ discard block |
||
| 105 | 104 | * Magic getter for our object. |
| 106 | 105 | * @param string $field |
| 107 | 106 | * @throws Exception Throws an exception if the field is invalid. |
| 108 | - * @return mixed |
|
| 107 | + * @return CMB2_Field |
|
| 109 | 108 | */ |
| 110 | 109 | public function __get( $field ) { |
| 111 | 110 | switch ( $field ) { |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | */ |
| 39 | 39 | public function __construct( CMB2_Types $types, $args = array() ) { |
| 40 | 40 | $this->types = $types; |
| 41 | - $args['rendered'] = isset( $args['rendered'] ) ? (bool) $args['rendered'] : true; |
|
| 41 | + $args[ 'rendered' ] = isset( $args[ 'rendered' ] ) ? (bool) $args[ 'rendered' ] : true; |
|
| 42 | 42 | $this->args = $args; |
| 43 | 43 | } |
| 44 | 44 | |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | * @return string|CMB2_Type_Base Rendered output or this object. |
| 57 | 57 | */ |
| 58 | 58 | public function rendered( $rendered ) { |
| 59 | - if ( $this->args['rendered'] ) { |
|
| 59 | + if ( $this->args[ 'rendered' ] ) { |
|
| 60 | 60 | return is_a( $rendered, __CLASS__ ) ? $rendered->rendered : $rendered; |
| 61 | 61 | } |
| 62 | 62 | |
@@ -38,6 +38,9 @@ discard block |
||
| 38 | 38 | return $date_input . "\n" . $time_input; |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | + /** |
|
| 42 | + * @param boolean $has_good_value |
|
| 43 | + */ |
|
| 41 | 44 | public function date_args( $args, $has_good_value ) { |
| 42 | 45 | $date_args = wp_parse_args( $args['datepicker'], array( |
| 43 | 46 | 'class' => 'cmb2-text-small cmb2-datepicker', |
@@ -51,6 +54,9 @@ discard block |
||
| 51 | 54 | return $this->parse_picker_options( 'date', $date_args ); |
| 52 | 55 | } |
| 53 | 56 | |
| 57 | + /** |
|
| 58 | + * @param boolean $has_good_value |
|
| 59 | + */ |
|
| 54 | 60 | public function time_args( $args, $has_good_value ) { |
| 55 | 61 | $time_args = wp_parse_args( $args['timepicker'], array( |
| 56 | 62 | 'class' => 'cmb2-timepicker text-time', |
@@ -22,16 +22,16 @@ discard block |
||
| 22 | 22 | 'timepicker' => array(), |
| 23 | 23 | ) ); |
| 24 | 24 | |
| 25 | - if ( empty( $args['value'] ) ) { |
|
| 26 | - $args['value'] = $field->escaped_value(); |
|
| 25 | + if ( empty( $args[ 'value' ] ) ) { |
|
| 26 | + $args[ 'value' ] = $field->escaped_value(); |
|
| 27 | 27 | // This will be used if there is a select_timezone set for this field |
| 28 | 28 | $tz_offset = $field->field_timezone_offset(); |
| 29 | 29 | if ( ! empty( $tz_offset ) ) { |
| 30 | - $args['value'] -= $tz_offset; |
|
| 30 | + $args[ 'value' ] -= $tz_offset; |
|
| 31 | 31 | } |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - $has_good_value = ! empty( $args['value'] ) && ! is_array( $args['value'] ); |
|
| 34 | + $has_good_value = ! empty( $args[ 'value' ] ) && ! is_array( $args[ 'value' ] ); |
|
| 35 | 35 | |
| 36 | 36 | $date_input = parent::render( $this->date_args( $args, $has_good_value ) ); |
| 37 | 37 | $time_input = parent::render( $this->time_args( $args, $has_good_value ) ); |
@@ -40,31 +40,31 @@ discard block |
||
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | public function date_args( $args, $has_good_value ) { |
| 43 | - $date_args = wp_parse_args( $args['datepicker'], array( |
|
| 43 | + $date_args = wp_parse_args( $args[ 'datepicker' ], array( |
|
| 44 | 44 | 'class' => 'cmb2-text-small cmb2-datepicker', |
| 45 | 45 | 'name' => $this->_name( '[date]' ), |
| 46 | 46 | 'id' => $this->_id( '_date' ), |
| 47 | - 'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args['value'] ) : '', |
|
| 47 | + 'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args[ 'value' ] ) : '', |
|
| 48 | 48 | 'desc' => '', |
| 49 | 49 | ) ); |
| 50 | 50 | |
| 51 | - $date_args['rendered'] = true; |
|
| 51 | + $date_args[ 'rendered' ] = true; |
|
| 52 | 52 | |
| 53 | 53 | // Let's get the date-format, and set it up as a data attr for the field. |
| 54 | 54 | return $this->parse_picker_options( 'date', $date_args ); |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | public function time_args( $args, $has_good_value ) { |
| 58 | - $time_args = wp_parse_args( $args['timepicker'], array( |
|
| 58 | + $time_args = wp_parse_args( $args[ 'timepicker' ], array( |
|
| 59 | 59 | 'class' => 'cmb2-timepicker text-time', |
| 60 | 60 | 'name' => $this->_name( '[time]' ), |
| 61 | 61 | 'id' => $this->_id( '_time' ), |
| 62 | - 'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args['value'] ) : '', |
|
| 63 | - 'desc' => $args['desc'], |
|
| 62 | + 'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args[ 'value' ] ) : '', |
|
| 63 | + 'desc' => $args[ 'desc' ], |
|
| 64 | 64 | 'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker', 'jquery-ui-datetimepicker' ), |
| 65 | 65 | ) ); |
| 66 | 66 | |
| 67 | - $time_args['rendered'] = true; |
|
| 67 | + $time_args[ 'rendered' ] = true; |
|
| 68 | 68 | |
| 69 | 69 | // Let's get the time-format, and set it up as a data attr for the field. |
| 70 | 70 | return $this->parse_picker_options( 'time', $time_args ); |