Merged in feature/MAW-855-import-code-into-aws (pull request #2)
code import from pantheon * code import from pantheon
This commit is contained in:
@@ -240,6 +240,12 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
|
||||
if ( ! isset( $value['placeholder'] ) ) {
|
||||
$value['placeholder'] = '';
|
||||
}
|
||||
if ( ! isset( $value['row_class'] ) ) {
|
||||
$value['row_class'] = '';
|
||||
}
|
||||
if ( ! empty( $value['row_class'] ) && substr( $value['row_class'], 0, 16 ) !== 'wc-settings-row-' ) {
|
||||
$value['row_class'] = 'wc-settings-row-' . $value['row_class'];
|
||||
}
|
||||
if ( ! isset( $value['suffix'] ) ) {
|
||||
$value['suffix'] = '';
|
||||
}
|
||||
@@ -281,7 +287,9 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
|
||||
break;
|
||||
|
||||
case 'info':
|
||||
echo '<tr><th scope="row" class="titledesc"/><td style="' . esc_attr( $value['css'] ) . '">';
|
||||
?><tr valign="top"<?php echo $value['row_class'] ? ' class="' . esc_attr( $value['row_class'] ) . '"' : '' ?>">
|
||||
<th scope="row" class="titledesc"/><td style="<?php echo esc_attr( $value['css'] ); ?>">;
|
||||
<?php
|
||||
echo wp_kses_post( wpautop( wptexturize( $value['text'] ) ) );
|
||||
echo '</td></tr>';
|
||||
break;
|
||||
@@ -312,7 +320,7 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
|
||||
case 'tel':
|
||||
$option_value = $value['value'];
|
||||
|
||||
?><tr valign="top">
|
||||
?><tr valign="top"<?php echo $value['row_class'] ? ' class="' . esc_attr( $value['row_class'] ) . '"' : '' ?>">
|
||||
<th scope="row" class="titledesc">
|
||||
<label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo esc_html( $value['title'] ); ?> <?php echo $tooltip_html; // WPCS: XSS ok. ?></label>
|
||||
</th>
|
||||
@@ -337,7 +345,7 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
|
||||
$option_value = $value['value'];
|
||||
|
||||
?>
|
||||
<tr valign="top">
|
||||
<tr valign="top"<?php echo $value['row_class'] ? ' class="' . esc_attr( $value['row_class'] ) . '"' : '' ?>">
|
||||
<th scope="row" class="titledesc">
|
||||
<label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo esc_html( $value['title'] ); ?> <?php echo $tooltip_html; // WPCS: XSS ok. ?></label>
|
||||
</th>
|
||||
@@ -365,7 +373,7 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
|
||||
$option_value = $value['value'];
|
||||
|
||||
?>
|
||||
<tr valign="top">
|
||||
<tr valign="top"<?php echo $value['row_class'] ? ' class="' . esc_attr( $value['row_class'] ) . '"' : '' ?>">
|
||||
<th scope="row" class="titledesc">
|
||||
<label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo esc_html( $value['title'] ); ?> <?php echo $tooltip_html; // WPCS: XSS ok. ?></label>
|
||||
</th>
|
||||
@@ -391,7 +399,7 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
|
||||
$option_value = $value['value'];
|
||||
|
||||
?>
|
||||
<tr valign="top">
|
||||
<tr valign="top"<?php echo $value['row_class'] ? ' class="' . esc_attr( $value['row_class'] ) . '"' : '' ?>">
|
||||
<th scope="row" class="titledesc">
|
||||
<label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo esc_html( $value['title'] ); ?> <?php echo $tooltip_html; // WPCS: XSS ok. ?></label>
|
||||
</th>
|
||||
@@ -434,7 +442,7 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
|
||||
$show_desc_at_end = $value['desc_at_end'] ?? false;
|
||||
|
||||
?>
|
||||
<tr valign="top">
|
||||
<tr valign="top"<?php echo $value['row_class'] ? ' class="' . esc_attr( $value['row_class'] ) . '"' : '' ?>">
|
||||
<th scope="row" class="titledesc">
|
||||
<label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo esc_html( $value['title'] ); ?> <?php echo $tooltip_html; // WPCS: XSS ok. ?></label>
|
||||
</th>
|
||||
@@ -494,6 +502,9 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
|
||||
if ( 'option' === $value['show_if_checked'] ) {
|
||||
$visibility_class[] = 'show_options_if_checked';
|
||||
}
|
||||
if ( $value['row_class'] ) {
|
||||
$visibility_class[] = $value['row_class'];
|
||||
}
|
||||
|
||||
$must_disable = $value['disabled'] ?? false;
|
||||
|
||||
@@ -566,7 +577,7 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
|
||||
}
|
||||
|
||||
?>
|
||||
<tr valign="top">
|
||||
<tr valign="top"<?php echo $value['row_class'] ? ' class="' . esc_attr( $value['row_class'] ) . '"' : '' ?>">
|
||||
<th scope="row" class="titledesc">
|
||||
<label><?php echo esc_html( $value['title'] ); ?> <?php echo $tooltip_html . $disabled_message; // WPCS: XSS ok. ?></label>
|
||||
</th>
|
||||
@@ -600,7 +611,7 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
|
||||
}
|
||||
|
||||
?>
|
||||
<tr valign="top" class="single_select_page">
|
||||
<tr valign="top" class="single_select_page"<?php echo $value['row_class'] ? ' class="' . esc_attr( $value['row_class'] ) . '"' : '' ?>">
|
||||
<th scope="row" class="titledesc">
|
||||
<label><?php echo esc_html( $value['title'] ); ?> <?php echo $tooltip_html; // WPCS: XSS ok. ?></label>
|
||||
</th>
|
||||
@@ -625,7 +636,7 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
|
||||
);
|
||||
}
|
||||
?>
|
||||
<tr valign="top" class="single_select_page">
|
||||
<tr valign="top" class="single_select_page"<?php echo $value['row_class'] ? ' class="' . esc_attr( $value['row_class'] ) . '"' : '' ?>">
|
||||
<th scope="row" class="titledesc">
|
||||
<label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo esc_html( $value['title'] ); ?> <?php echo $tooltip_html; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></label>
|
||||
</th>
|
||||
@@ -665,7 +676,7 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
|
||||
$state = '*';
|
||||
}
|
||||
?>
|
||||
<tr valign="top">
|
||||
<tr valign="top"<?php echo $value['row_class'] ? ' class="' . esc_attr( $value['row_class'] ) . '"' : '' ?>">
|
||||
<th scope="row" class="titledesc">
|
||||
<label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo esc_html( $value['title'] ); ?> <?php echo $tooltip_html; // WPCS: XSS ok. ?></label>
|
||||
</th>
|
||||
@@ -689,7 +700,7 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
|
||||
|
||||
asort( $countries );
|
||||
?>
|
||||
<tr valign="top">
|
||||
<tr valign="top"<?php echo $value['row_class'] ? ' class="' . esc_attr( $value['row_class'] ) . '"' : '' ?>">
|
||||
<th scope="row" class="titledesc">
|
||||
<label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo esc_html( $value['title'] ); ?> <?php echo $tooltip_html; // WPCS: XSS ok. ?></label>
|
||||
</th>
|
||||
@@ -718,7 +729,7 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
|
||||
);
|
||||
$option_value = wc_parse_relative_date_option( $value['value'] );
|
||||
?>
|
||||
<tr valign="top">
|
||||
<tr valign="top"<?php echo $value['row_class'] ? ' class="' . esc_attr( $value['row_class'] ) . '"' : '' ?>">
|
||||
<th scope="row" class="titledesc">
|
||||
<label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo esc_html( $value['title'] ); ?> <?php echo $tooltip_html; // WPCS: XSS ok. ?></label>
|
||||
</th>
|
||||
|
||||
Reference in New Issue
Block a user