Skip to content

Conditional display markup for fileupload-type must not be escaped #206

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
TonyBogdanov wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Conditional display markup for fileupload-type must not be escaped #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c10b33d
Conditional display markup for fileupload-type must not be escaped
TonyBogdanov Feb 15, 2017
dce9da7
Missing conditional display markup for text-editor data type
TonyBogdanov Feb 25, 2017
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
2 changes: 1 addition & 1 deletion runway-framework/data-types/fileupload-type.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class="custom-file-upload custom-data-type" <?php echo rf_string( $section ); //
</legend>
<input id="upload_image-<?php echo esc_attr( $this->field->alias ); ?>"
class="custom-data-type" <?php echo rf_string( $section ); // escaped above ?>
data-type="fileupload-type" <?php echo esc_attr( parent::add_data_conditional_display( $this->field ) ); ?>
data-type="fileupload-type" <?php echo parent::add_data_conditional_display( $this->field ); ?>
type="text" size="36" name="<?php echo esc_attr( $this->field->alias ); ?>"
value="<?php echo esc_attr( @stripslashes( $input_value ) ); ?>" <?php $this->link(); ?> />
<span class="field_label">
Expand Down
8 changes: 8 additions & 0 deletions runway-framework/data-types/text-editor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@ public function render_content( $vals = null ) {
$editorArea.attr('data-section', '<?php echo isset( $this->page->section ) ? $this->page->section : '' ?>');
$editorArea.attr('data-type', 'texteditor-type');

<?php if( isset( $this->field->conditionalAlias ) && !empty( $this->field->conditionalAlias ) ): ?>
$editorArea.attr('data-conditionalAlias', '<?php echo esc_js( $this->field->conditionalAlias ); ?>');
<?php endif; if( isset( $this->field->conditionalValue ) && !empty( $this->field->conditionalValue ) ): ?>
$editorArea.attr('data-conditionalValue', '<?php echo esc_js( $this->field->conditionalValue ); ?>');
<?php endif; if( isset( $this->field->conditionalAction ) && !empty( $this->field->conditionalAction ) ): ?>
$editorArea.attr('data-conditionalAction', '<?php echo esc_js( $this->field->conditionalAction ); ?>');
<?php endif; ?>

try {

// Fix the version compatibility issue for jquery-ui:
Expand Down