Skip to content

PHP Notice: Undefined variable: hidden_safe #717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nicolafranchini wants to merge 4 commits into
base: master
Choose a base branch
from
Open

PHP Notice: Undefined variable: hidden_safe #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77ab45d
Fix: PHP Notice: Undefined variable: hidden_safe in /includes/ot-func…
Aug 29, 2019
2f0f9e4
https://github.com/valendesigns/option-tree/issues/710
Aug 29, 2019
eba44a9
Fix: Notice: Undefined index: id in /includes/class-ot-settings.php …
Sep 1, 2019
471ae39
SubModule OT
nicolafranchini Sep 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions includes/class-ot-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,23 @@ public function display_page() {
echo '<ul class="ui-tabs-nav">';

// Loop through page sections.
// foreach ( (array) $page['sections'] as $section ) {
// echo '<li id="tab_' . esc_attr( $section['id'] ) . '"><a href="#section_' . esc_attr( $section['id'] ) . '">' . wp_kses_post( $section['title'] ) . '</a></li>';
// }
// }
// Plan-B edit to show group title.
foreach ( (array) $page['sections'] as $section ) {
echo '<li id="tab_' . esc_attr( $section['id'] ) . '"><a href="#section_' . esc_attr( $section['id'] ) . '">' . wp_kses_post( $section['title'] ) . '</a></li>';
if ( isset( $section['group'] ) ) {
if ( isset( $section['group']['title'] ) ) {
echo '<li class="pb-section-group">';
if ( isset( $section['group']['icon'] ) ) {
echo '<i class="' . esc_attr( $section['group']['icon'] ) . '"></i> ';
}
echo esc_attr( $section['group']['title'] ) . '</li>';
}
}
echo '<li id="tab_' . esc_attr( $section['id'] ) . '">';
echo '<a href="#section_' . esc_attr( $section['id'] ) . '">' . wp_kses_post( $section['title'] ) . '</a></li>';
}

echo '</ul>';
Expand Down Expand Up @@ -698,7 +713,7 @@ public function sanitize_callback( $input ) {

foreach ( $current_settings['settings'] as $check_setting ) {

if ( $setting['id'] === $check_setting['id'] && ! empty( $current_options[ $setting['id'] ] ) ) {
if ( isset( $check_setting['id'] ) && $setting['id'] === $check_setting['id'] && ! empty( $current_options[ $setting['id'] ] ) ) {

foreach ( $current_options[ $setting['id'] ] as $key => $value ) {

Expand Down
5 changes: 3 additions & 2 deletions includes/ot-functions-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4718,7 +4718,7 @@ function ot_theme_options_layouts_form() {

echo '<select name="' . esc_attr( ot_layouts_id() ) . '[active_layout]" class="option-tree-ui-select">';

$hidden = '';
$hidden_safe = '';

foreach ( $layouts as $key => $data ) {

Expand Down Expand Up @@ -5057,7 +5057,8 @@ function ot_decode( $value ) {
preg_match( '/a:\d+:{.*?}/', $decoded, $array_matches, PREG_OFFSET_CAPTURE, 0 );

// Search for an object.
preg_match( '/O|C:\+?\d+:"[a-z0-9_]+":\+?\d+:/i', $decoded, $obj_matches, PREG_OFFSET_CAPTURE, 0 );
// preg_match( '/O|C:\+?\d+:"[a-z0-9_]+":\+?\d+:/i', $decoded, $obj_matches, PREG_OFFSET_CAPTURE, 0 );
preg_match( '/O:\d+:"[a-z0-9_]+":\d+:{.*?}/i', $decoded, $obj_matches, PREG_OFFSET_CAPTURE, 0 );

// Prevent object injection or non arrays.
if ( $obj_matches || ! $array_matches ) {
Expand Down