Skip to content
This repository was archived by the owner on Aug 1, 2021. It is now read-only.

Commit 0267043

Browse files
1 parent 6708b44 commit 0267043

File tree

5 files changed

+18
-17
lines changed

5 files changed

+18
-17
lines changed

src/classes/controllers/admin/dashboard.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected function get_view_args() {
8585
private function update_setting( $name ) {
8686
$detail = $this->app->setting->get_setting( $name, true );
8787
$default = null;
88-
if ( $this->app->utility->array_get( $detail, 'type' ) === 'bool' ) {
88+
if ( $this->app->array->get( $detail, 'type' ) === 'bool' ) {
8989
$default = 0;
9090
}
9191

src/classes/models/assets.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public function parse_setting( $setting, $key ) {
180180
*/
181181
/** @noinspection PhpUnusedPrivateMethodInspection */
182182
private function changed_option( $key ) {
183-
if ( $this->app->utility->starts_with( $key, $this->get_filter_prefix() ) ) {
183+
if ( $this->app->string->starts_with( $key, $this->get_filter_prefix() ) ) {
184184
$this->clear_options_cache();
185185
}
186186
}
@@ -309,17 +309,17 @@ public function get_setting_details( $target, $prefix = null ) {
309309
* @return array
310310
*/
311311
private function get_setting( $name, $form, $prefix = null ) {
312-
$detail = $this->app->utility->array_get( is_array( $form ) ? $form : [], 'detail', $this->app->setting->get_setting( $name, true ) );
313-
$value = $this->app->utility->array_get( $detail, 'value' );
314-
$ret = [
312+
$detail = $this->app->array->get( is_array( $form ) ? $form : [], 'detail', $this->app->setting->get_setting( $name, true ) );
313+
$value = $this->app->array->get( $detail, 'value' );
314+
$ret = [
315315
'id' => $this->get_id_prefix() . $name,
316316
'class' => 'marker-animation-option',
317317
'name' => ( isset( $prefix ) ? $prefix : $this->get_name_prefix() ) . $name,
318318
'value' => $value,
319-
'label' => $this->translate( $this->app->utility->array_get( $detail, 'label', $name ) ),
319+
'label' => $this->translate( $this->app->array->get( $detail, 'label', $name ) ),
320320
'attributes' => [
321321
'data-value' => $value,
322-
'data-default' => $this->app->utility->array_get( $detail, 'default' ),
322+
'data-default' => $this->app->array->get( $detail, 'default' ),
323323
],
324324
'detail' => $detail,
325325
];
@@ -330,9 +330,10 @@ private function get_setting( $name, $form, $prefix = null ) {
330330
} else {
331331
$ret['form'] = $form;
332332
}
333-
if ( $this->app->utility->array_get( $detail, 'type' ) === 'bool' ) {
333+
if ( $this->app->array->get( $detail, 'type' ) === 'bool' ) {
334334
$ret['value'] = 1;
335335
! empty( $value ) and $ret['attributes']['checked'] = 'checked';
336+
$ret['label'] = $this->translate( 'Valid' );
336337
}
337338
if ( $ret['form'] === 'select' ) {
338339
$ret['selected'] = $value;

src/classes/models/custom_post/setting.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ protected function filter_edit_form_params(
6969
$assets = \Marker_Animation\Classes\Models\Assets::get_instance( $this->app );
7070
$setting_details = $assets->get_setting_details( 'setting' );
7171
foreach ( $this->get_setting_list() as $key => $name ) {
72-
$params['columns'][ $key ]['args'] = $this->app->utility->array_get( $setting_details, $name );
72+
$params['columns'][ $key ]['args'] = $this->app->array->get( $setting_details, $name );
7373
unset( $params['columns'][ $key ]['args']['name'] );
7474
unset( $params['columns'][ $key ]['args']['value'] );
7575
unset( $params['columns'][ $key ]['args']['selected'] );
@@ -144,7 +144,7 @@ protected function get_manage_posts_columns() {
144144
$attributes = [];
145145
$details = [];
146146
foreach ( $this->get_setting_list() as $key => $name ) {
147-
$setting = $this->app->utility->array_get( $setting_details, $name );
147+
$setting = $this->app->array->get( $setting_details, $name );
148148
if ( empty( $setting ) ) {
149149
continue;
150150
}
@@ -332,7 +332,7 @@ public function get_settings( $target ) {
332332
$options[ $name ] = $data[ $key ];
333333
continue;
334334
}
335-
$setting = $this->app->utility->array_get( $setting_details, $name );
335+
$setting = $this->app->array->get( $setting_details, $name );
336336
if ( empty( $setting ) ) {
337337
continue;
338338
}

src/views/admin/include/custom_post/color.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
/** @var array $column */
1818
/** @var string $name */
1919
/** @var string $prefix */
20-
$attr = $instance->app->utility->array_get( $column, 'attributes', [] );
20+
$attr = $instance->app->array->get( $column, 'attributes', [] );
2121
$_data = [];
2222
! empty( $data[ $name ] ) and $_data[ $name ] = $data[ $name ];
2323
?>
2424
<?php $instance->form( 'color', [
2525
'name' => $prefix . $name,
2626
'id' => $prefix . $name,
27-
'value' => $instance->old( $prefix . $name, $_data, $name, $instance->app->utility->array_get( $column, 'default' ) ),
27+
'value' => $instance->old( $prefix . $name, $_data, $name, $instance->app->array->get( $column, 'default' ) ),
2828
'attributes' => $attr,
29-
], $instance->app->utility->array_get( $column, 'args', [] ) ); ?>
29+
], $instance->app->array->get( $column, 'args', [] ) ); ?>

src/views/admin/include/custom_post/select.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
/** @var array $column */
1818
/** @var string $name */
1919
/** @var string $prefix */
20-
$attr = $instance->app->utility->array_get( $column, 'attributes', [] );
21-
$options = $instance->app->utility->array_get( $column, 'options', [] );
20+
$attr = $instance->app->array->get( $column, 'attributes', [] );
21+
$options = $instance->app->array->get( $column, 'options', [] );
2222
$selected = [];
2323
$value = $instance->old( $prefix . $name, $data, $name );
2424
if ( ! empty( $value ) ) {
@@ -33,4 +33,4 @@
3333
'attributes' => $attr,
3434
'options' => $options,
3535
'selected' => $selected,
36-
], $instance->app->utility->array_get( $column, 'args', [] ) ); ?>
36+
], $instance->app->array->get( $column, 'args', [] ) ); ?>

0 commit comments

Comments
 (0)