@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | $output = ''; |
22 | 22 | |
23 | 23 | // if options array and 'url' => false, then hide the url field |
24 | - $input_type = array_key_exists( 'url', $options ) && false === $options['url'] ? 'hidden' : 'text'; |
|
24 | + $input_type = array_key_exists( 'url', $options ) && false === $options[ 'url' ] ? 'hidden' : 'text'; |
|
25 | 25 | |
26 | 26 | $output .= parent::render( array( |
27 | 27 | 'type' => $input_type, |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | if ( $_id_value ) { |
72 | 72 | $image = wp_get_attachment_image( $_id_value, $img_size, null, array( 'class' => 'cmb-file-field-image' ) ); |
73 | 73 | } else { |
74 | - $size = is_array( $img_size ) ? $img_size[0] : 350; |
|
74 | + $size = is_array( $img_size ) ? $img_size[ 0 ] : 350; |
|
75 | 75 | $image = '<img style="max-width: ' . absint( $size ) . 'px; width: 100%; height: auto;" src="' . $meta_value . '" alt="" />'; |
76 | 76 | } |
77 | 77 |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | $dir = wp_upload_dir(); |
31 | 31 | |
32 | 32 | // Is URL in uploads directory? |
33 | - if ( false === strpos( $img_url, $dir['baseurl'] . '/' ) ) { |
|
33 | + if ( false === strpos( $img_url, $dir[ 'baseurl' ] . '/' ) ) { |
|
34 | 34 | return false; |
35 | 35 | } |
36 | 36 | |
@@ -55,8 +55,8 @@ discard block |
||
55 | 55 | |
56 | 56 | foreach ( $query->posts as $post_id ) { |
57 | 57 | $meta = wp_get_attachment_metadata( $post_id ); |
58 | - $original_file = basename( $meta['file'] ); |
|
59 | - $cropped_image_files = isset( $meta['sizes'] ) ? wp_list_pluck( $meta['sizes'], 'file' ) : array(); |
|
58 | + $original_file = basename( $meta[ 'file' ] ); |
|
59 | + $cropped_image_files = isset( $meta[ 'sizes' ] ) ? wp_list_pluck( $meta[ 'sizes' ], 'file' ) : array(); |
|
60 | 60 | if ( $original_file === $file || in_array( $file, $cropped_image_files ) ) { |
61 | 61 | $attachment_id = $post_id; |
62 | 62 | break; |
@@ -140,8 +140,7 @@ discard block |
||
140 | 140 | } |
141 | 141 | |
142 | 142 | return $this->is_valid_time_stamp( $string ) |
143 | - ? (int) $string : |
|
144 | - strtotime( (string) $string ); |
|
143 | + ? (int) $string : strtotime( (string) $string ); |
|
145 | 144 | } |
146 | 145 | |
147 | 146 | /** |
@@ -172,7 +171,7 @@ discard block |
||
172 | 171 | * @param mixed $value Value to check |
173 | 172 | * @return bool True or false |
174 | 173 | */ |
175 | - public function notempty( $value ){ |
|
174 | + public function notempty( $value ) { |
|
176 | 175 | return null !== $value && '' !== $value && false !== $value; |
177 | 176 | } |
178 | 177 | |
@@ -322,24 +321,24 @@ discard block |
||
322 | 321 | |
323 | 322 | // order is relevant here, since the replacement will be done sequentially. |
324 | 323 | $supported_options = array( |
325 | - 'd' => 'dd', // Day, leading 0 |
|
326 | - 'j' => 'd', // Day, no 0 |
|
327 | - 'z' => 'o', // Day of the year, no leading zeroes, |
|
324 | + 'd' => 'dd', // Day, leading 0 |
|
325 | + 'j' => 'd', // Day, no 0 |
|
326 | + 'z' => 'o', // Day of the year, no leading zeroes, |
|
328 | 327 | // 'D' => 'D', // Day name short, not sure how it'll work with translations |
329 | 328 | // 'l' => 'DD', // Day name full, idem before |
330 | - 'm' => 'mm', // Month of the year, leading 0 |
|
331 | - 'n' => 'm', // Month of the year, no leading 0 |
|
329 | + 'm' => 'mm', // Month of the year, leading 0 |
|
330 | + 'n' => 'm', // Month of the year, no leading 0 |
|
332 | 331 | // 'M' => 'M', // Month, Short name |
333 | 332 | // 'F' => 'MM', // Month, full name, |
334 | - 'y' => 'y', // Year, two digit |
|
335 | - 'Y' => 'yy', // Year, full |
|
336 | - 'H' => 'HH', // Hour with leading 0 (24 hour) |
|
337 | - 'G' => 'H', // Hour with no leading 0 (24 hour) |
|
338 | - 'h' => 'hh', // Hour with leading 0 (12 hour) |
|
339 | - 'g' => 'h', // Hour with no leading 0 (12 hour), |
|
340 | - 'i' => 'mm', // Minute with leading 0, |
|
341 | - 's' => 'ss', // Second with leading 0, |
|
342 | - 'a' => 'tt', // am/pm |
|
333 | + 'y' => 'y', // Year, two digit |
|
334 | + 'Y' => 'yy', // Year, full |
|
335 | + 'H' => 'HH', // Hour with leading 0 (24 hour) |
|
336 | + 'G' => 'H', // Hour with no leading 0 (24 hour) |
|
337 | + 'h' => 'hh', // Hour with leading 0 (12 hour) |
|
338 | + 'g' => 'h', // Hour with no leading 0 (12 hour), |
|
339 | + 'i' => 'mm', // Minute with leading 0, |
|
340 | + 's' => 'ss', // Second with leading 0, |
|
341 | + 'a' => 'tt', // am/pm |
|
343 | 342 | 'A' => 'TT' // AM/PM |
344 | 343 | ); |
345 | 344 | |
@@ -360,7 +359,7 @@ discard block |
||
360 | 359 | * @return string Modified value |
361 | 360 | */ |
362 | 361 | public function wrap_escaped_chars( $value ) { |
363 | - return "'" . str_replace( '\\', '', $value[0] ) . "'"; |
|
362 | + return "'" . str_replace( '\\', '', $value[ 0 ] ) . "'"; |
|
364 | 363 | } |
365 | 364 | |
366 | 365 | /** |
@@ -15,7 +15,7 @@ |
||
15 | 15 | public function render() { |
16 | 16 | $names = $this->get_object_terms(); |
17 | 17 | |
18 | - $saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->get_default() : $names[key( $names )]->slug; |
|
18 | + $saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->get_default() : $names[ key( $names ) ]->slug; |
|
19 | 19 | $terms = $this->get_terms(); |
20 | 20 | $options = ''; |
21 | 21 | $option_none = $this->field->args( 'show_option_none' ); |
@@ -29,7 +29,7 @@ |
||
29 | 29 | ), $this->args ); |
30 | 30 | |
31 | 31 | return $this->rendered( |
32 | - sprintf( '<%1$s %2$s>%3$s</%1$s>%4$s', $a['tag'], $this->concat_attrs( $a, array( 'tag', 'name', 'desc' ) ), $a['name'], $a['desc'] ) |
|
32 | + sprintf( '<%1$s %2$s>%3$s</%1$s>%4$s', $a[ 'tag' ], $this->concat_attrs( $a, array( 'tag', 'name', 'desc' ) ), $a[ 'name' ], $a[ 'desc' ] ) |
|
33 | 33 | ); |
34 | 34 | } |
35 | 35 |
@@ -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 ); |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | if ( is_array( $this->field->value ) ) { |
125 | 125 | |
126 | 126 | // Then loop and output. |
127 | - echo '<ul class="cmb2-'. str_replace( '_', '-', $this->field->type() ) .'">'; |
|
127 | + echo '<ul class="cmb2-' . str_replace( '_', '-', $this->field->type() ) . '">'; |
|
128 | 128 | foreach ( $this->field->value as $val ) { |
129 | 129 | $this->value = $val; |
130 | 130 | echo '<li>', $this->_display(), '</li>'; |
@@ -197,8 +197,8 @@ discard block |
||
197 | 197 | $options = $this->field->options(); |
198 | 198 | |
199 | 199 | $fallback = $this->field->args( 'show_option_none' ); |
200 | - if ( ! $fallback && isset( $options[''] ) ) { |
|
201 | - $fallback = $options['']; |
|
200 | + if ( ! $fallback && isset( $options[ '' ] ) ) { |
|
201 | + $fallback = $options[ '' ]; |
|
202 | 202 | } |
203 | 203 | if ( ! $this->value && $fallback ) { |
204 | 204 | echo $fallback; |
@@ -225,9 +225,9 @@ discard block |
||
225 | 225 | $output = array(); |
226 | 226 | foreach ( $this->value as $val ) { |
227 | 227 | if ( isset( $options[ $val ] ) ) { |
228 | - $output[] = $options[ $val ]; |
|
228 | + $output[ ] = $options[ $val ]; |
|
229 | 229 | } else { |
230 | - $output[] = esc_attr( $val ); |
|
230 | + $output[ ] = esc_attr( $val ); |
|
231 | 231 | } |
232 | 232 | } |
233 | 233 | |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | * @since 2.2.2 |
252 | 252 | */ |
253 | 253 | protected function _display() { |
254 | - echo '<xmp class="cmb2-code">'. print_r( $this->value, true ) .'</xmp>'; |
|
254 | + echo '<xmp class="cmb2-code">' . print_r( $this->value, true ) . '</xmp>'; |
|
255 | 255 | } |
256 | 256 | } |
257 | 257 | |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | if ( $datetime && $datetime instanceof DateTime ) { |
294 | 294 | $tz = $datetime->getTimezone(); |
295 | 295 | $tzstring = $tz->getName(); |
296 | - $this->value = $datetime->getTimestamp(); |
|
296 | + $this->value = $datetime->getTimestamp(); |
|
297 | 297 | } |
298 | 298 | |
299 | 299 | $date = $this->field->get_timestamp_format( 'date_format', $this->value ); |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | if ( is_wp_error( $terms ) || empty( $terms ) && ( $default = $this->field->get_default() ) ) { |
318 | 318 | $term = get_term_by( 'slug', $default, $taxonomy ); |
319 | 319 | } elseif ( ! empty( $terms ) ) { |
320 | - $term = $terms[key( $terms )]; |
|
320 | + $term = $terms[ key( $terms ) ]; |
|
321 | 321 | } |
322 | 322 | |
323 | 323 | if ( $term ) { |
@@ -341,10 +341,10 @@ discard block |
||
341 | 341 | $terms = array(); |
342 | 342 | if ( is_array( $default ) ) { |
343 | 343 | foreach ( $default as $slug ) { |
344 | - $terms[] = get_term_by( 'slug', $slug, $taxonomy ); |
|
344 | + $terms[ ] = get_term_by( 'slug', $slug, $taxonomy ); |
|
345 | 345 | } |
346 | 346 | } else { |
347 | - $terms[] = get_term_by( 'slug', $default, $taxonomy ); |
|
347 | + $terms[ ] = get_term_by( 'slug', $default, $taxonomy ); |
|
348 | 348 | } |
349 | 349 | } |
350 | 350 | |
@@ -353,7 +353,7 @@ discard block |
||
353 | 353 | $links = array(); |
354 | 354 | foreach ( $terms as $term ) { |
355 | 355 | $link = get_edit_term_link( $term->term_id, $taxonomy ); |
356 | - $links[] = '<a href="'. esc_url( $link ) .'">'. esc_html( $term->name ) .'</a>'; |
|
356 | + $links[ ] = '<a href="' . esc_url( $link ) . '">' . esc_html( $term->name ) . '</a>'; |
|
357 | 357 | } |
358 | 358 | // Then loop and output. |
359 | 359 | echo '<div class="cmb2-taxonomy-terms-', esc_attr( $taxonomy ), '">'; |
@@ -396,7 +396,7 @@ discard block |
||
396 | 396 | if ( $id ) { |
397 | 397 | $image = wp_get_attachment_image( $id, $img_size, null, array( 'class' => 'cmb-image-display' ) ); |
398 | 398 | } else { |
399 | - $size = is_array( $img_size ) ? $img_size[0] : 200; |
|
399 | + $size = is_array( $img_size ) ? $img_size[ 0 ] : 200; |
|
400 | 400 | $image = '<img class="cmb-image-display" style="max-width: ' . absint( $size ) . 'px; width: 100%; height: auto;" src="' . $url_value . '" alt="" />'; |
401 | 401 | } |
402 | 402 |
@@ -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 ); |
@@ -86,13 +86,13 @@ discard block |
||
86 | 86 | $oembed = cmb2_ajax()->get_oembed_no_edit( $args ); |
87 | 87 | |
88 | 88 | // Send back our embed |
89 | - if ( $oembed['embed'] && $oembed['embed'] != $oembed['fallback'] ) { |
|
90 | - return '<div class="cmb2-oembed">' . $oembed['embed'] . '</div>'; |
|
89 | + if ( $oembed[ 'embed' ] && $oembed[ 'embed' ] != $oembed[ 'fallback' ] ) { |
|
90 | + return '<div class="cmb2-oembed">' . $oembed[ 'embed' ] . '</div>'; |
|
91 | 91 | } |
92 | 92 | |
93 | - $error = sprintf( __( 'No oEmbed Results Found for %s. View more info at %s.', 'cmb2' ), $oembed['fallback'], ' <a href="http://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>' ); |
|
93 | + $error = sprintf( __( 'No oEmbed Results Found for %s. View more info at %s.', 'cmb2' ), $oembed[ 'fallback' ], ' <a href="http://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>' ); |
|
94 | 94 | |
95 | - if ( isset( $args['wp_error'] ) && $args['wp_error'] ) { |
|
95 | + if ( isset( $args[ 'wp_error' ] ) && $args[ 'wp_error' ] ) { |
|
96 | 96 | return new WP_Error( 'cmb2_get_oembed_result', $wp_error, compact( 'oembed', 'args' ) ); |
97 | 97 | } |
98 | 98 | |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | $cmb = CMB2_Boxes::get( $meta_box ); |
208 | 208 | } else { |
209 | 209 | // See if we already have an instance of this metabox |
210 | - $cmb = CMB2_Boxes::get( $meta_box['id'] ); |
|
210 | + $cmb = CMB2_Boxes::get( $meta_box[ 'id' ] ); |
|
211 | 211 | // If not, we'll initate a new metabox |
212 | 212 | $cmb = $cmb ? $cmb : new CMB2( $meta_box, $object_id ); |
213 | 213 | } |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | ) ); |
284 | 284 | |
285 | 285 | // Set object type explicitly (rather than trying to guess from context) |
286 | - $cmb->object_type( $args['object_type'] ); |
|
286 | + $cmb->object_type( $args[ 'object_type' ] ); |
|
287 | 287 | |
288 | 288 | // Save the metabox if it's been submitted |
289 | 289 | // check permissions |
@@ -291,32 +291,32 @@ discard block |
||
291 | 291 | if ( |
292 | 292 | $cmb->prop( 'save_fields' ) |
293 | 293 | // check nonce |
294 | - && isset( $_POST['submit-cmb'], $_POST['object_id'], $_POST[ $cmb->nonce() ] ) |
|
294 | + && isset( $_POST[ 'submit-cmb' ], $_POST[ 'object_id' ], $_POST[ $cmb->nonce() ] ) |
|
295 | 295 | && wp_verify_nonce( $_POST[ $cmb->nonce() ], $cmb->nonce() ) |
296 | - && $object_id && $_POST['object_id'] == $object_id |
|
296 | + && $object_id && $_POST[ 'object_id' ] == $object_id |
|
297 | 297 | ) { |
298 | 298 | $cmb->save_fields( $object_id, $cmb->object_type(), $_POST ); |
299 | 299 | } |
300 | 300 | |
301 | 301 | // Enqueue JS/CSS |
302 | - if ( $args['cmb_styles'] ) { |
|
302 | + if ( $args[ 'cmb_styles' ] ) { |
|
303 | 303 | CMB2_hookup::enqueue_cmb_css(); |
304 | 304 | } |
305 | 305 | |
306 | - if ( $args['enqueue_js'] ) { |
|
306 | + if ( $args[ 'enqueue_js' ] ) { |
|
307 | 307 | CMB2_hookup::enqueue_cmb_js(); |
308 | 308 | } |
309 | 309 | |
310 | - $form_format = apply_filters( 'cmb2_get_metabox_form_format', $args['form_format'], $object_id, $cmb ); |
|
310 | + $form_format = apply_filters( 'cmb2_get_metabox_form_format', $args[ 'form_format' ], $object_id, $cmb ); |
|
311 | 311 | |
312 | 312 | $format_parts = explode( '%3$s', $form_format ); |
313 | 313 | |
314 | 314 | // Show cmb form |
315 | - printf( $format_parts[0], $cmb->cmb_id, $object_id ); |
|
315 | + printf( $format_parts[ 0 ], $cmb->cmb_id, $object_id ); |
|
316 | 316 | $cmb->show_form(); |
317 | 317 | |
318 | - if ( isset( $format_parts[1] ) && $format_parts[1] ) { |
|
319 | - printf( str_ireplace( '%4$s', '%1$s', $format_parts[1] ), $args['save_button'] ); |
|
318 | + if ( isset( $format_parts[ 1 ] ) && $format_parts[ 1 ] ) { |
|
319 | + printf( str_ireplace( '%4$s', '%1$s', $format_parts[ 1 ] ), $args[ 'save_button' ] ); |
|
320 | 320 | } |
321 | 321 | |
322 | 322 | } |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | * @param array $args Optional arguments array |
330 | 330 | */ |
331 | 331 | function cmb2_metabox_form( $meta_box, $object_id = 0, $args = array() ) { |
332 | - if ( ! isset( $args['echo'] ) || $args['echo'] ) { |
|
332 | + if ( ! isset( $args[ 'echo' ] ) || $args[ 'echo' ] ) { |
|
333 | 333 | cmb2_print_metabox_form( $meta_box, $object_id, $args ); |
334 | 334 | } else { |
335 | 335 | return cmb2_get_metabox_form( $meta_box, $object_id, $args ); |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | |
352 | 352 | $schedule_format = str_replace( |
353 | 353 | array( 'M', 'Y', 'm', 'd', 'H', 'i', 'a' ), |
354 | - array('%b', '%Y', '%m', '%d', '%H', '%M', '%p' ), |
|
354 | + array( '%b', '%Y', '%m', '%d', '%H', '%M', '%p' ), |
|
355 | 355 | $date_format |
356 | 356 | ); |
357 | 357 | |
@@ -368,14 +368,14 @@ discard block |
||
368 | 368 | * 4 or 2 characters, as needed |
369 | 369 | */ |
370 | 370 | '%04d-%02d-%02d %02d:%02d:%02d', |
371 | - $parsed_time['tm_year'] + 1900, // This will be "111", so we need to add 1900. |
|
372 | - $parsed_time['tm_mon'] + 1, // This will be the month minus one, so we add one. |
|
373 | - $parsed_time['tm_mday'], |
|
374 | - $parsed_time['tm_hour'], |
|
375 | - $parsed_time['tm_min'], |
|
376 | - $parsed_time['tm_sec'] |
|
371 | + $parsed_time[ 'tm_year' ] + 1900, // This will be "111", so we need to add 1900. |
|
372 | + $parsed_time[ 'tm_mon' ] + 1, // This will be the month minus one, so we add one. |
|
373 | + $parsed_time[ 'tm_mday' ], |
|
374 | + $parsed_time[ 'tm_hour' ], |
|
375 | + $parsed_time[ 'tm_min' ], |
|
376 | + $parsed_time[ 'tm_sec' ] |
|
377 | 377 | ); |
378 | 378 | |
379 | - return new DateTime($ymd); |
|
379 | + return new DateTime( $ymd ); |
|
380 | 380 | } |
381 | 381 | } |
@@ -170,11 +170,11 @@ discard block |
||
170 | 170 | |
171 | 171 | $message = array( sprintf( __( 'Custom field types require a Type object instantiation to use this method. This method was called by the \'%s\' field type.' ), $this->field->type() ) ); |
172 | 172 | |
173 | - $message[] = is_object( $this->type ) |
|
173 | + $message[ ] = is_object( $this->type ) |
|
174 | 174 | ? __( 'That field type may not work as expected.', 'cmb2' ) |
175 | 175 | : __( 'That field type will not work as expected.', 'cmb2' ); |
176 | 176 | |
177 | - $message[] = __( 'See: https://github.com/mustardBees/cmb-field-select2/pull/34w for more information about this change.', 'cmb2' ); |
|
177 | + $message[ ] = __( 'See: https://github.com/mustardBees/cmb-field-select2/pull/34w for more information about this change.', 'cmb2' ); |
|
178 | 178 | |
179 | 179 | _doing_it_wrong( __CLASS__ . '::' . $method, implode( ' ', $message ), '2.2.2' ); |
180 | 180 | } |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | * @return string String of attributes for form element |
219 | 219 | */ |
220 | 220 | public function concat_attrs( $attrs, $attr_exclude = array() ) { |
221 | - $attr_exclude[] = 'rendered'; |
|
221 | + $attr_exclude[ ] = 'rendered'; |
|
222 | 222 | $attributes = ''; |
223 | 223 | foreach ( $attrs as $attr => $val ) { |
224 | 224 | $excluded = in_array( $attr, (array) $attr_exclude, true ); |
@@ -405,8 +405,8 @@ discard block |
||
405 | 405 | 'class' => 'cmb2-hidden', |
406 | 406 | ); |
407 | 407 | if ( $this->field->group ) { |
408 | - $args['data-groupid'] = $this->field->group->id(); |
|
409 | - $args['data-iterator'] = $this->iterator; |
|
408 | + $args[ 'data-groupid' ] = $this->field->group->id(); |
|
409 | + $args[ 'data-iterator' ] = $this->iterator; |
|
410 | 410 | } |
411 | 411 | return $this->input( $args ); |
412 | 412 | } |