Skip to content

Commit

Permalink
Merge branch 'dev' into fix/warning-for-protection-htaccess-file
Browse files Browse the repository at this point in the history
  • Loading branch information
brianhogg authored Aug 20, 2024
2 parents 60ba111 + c31bce8 commit 5c87cac
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
significance: patch
type: fixed
links:
- "#2708"
entry: Fixes placeholder label on the Dashboard Page selection dropdown.
6 changes: 6 additions & 0 deletions .changelogs/fix_quiz-question-html-in-quiz-summary.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
significance: patch
type: fixed
links:
- "#2734"
entry: Fix display of quiz question when viewing the quiz results if it contains
formatting.
5 changes: 2 additions & 3 deletions includes/admin/settings/class.llms.settings.accounts.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ public function get_settings() {
'class' => 'llms-select2-post',
'type' => 'select',
'custom_attributes' => array(
'data-post-type' => 'page',
'data-post-type' => 'page',
'data-placeholder' => __( 'Select a page', 'lifterlms' ),
),
'options' => llms_make_select2_post_array( get_option( 'lifterlms_myaccount_page_id', '' ) ),
),
Expand Down Expand Up @@ -372,7 +373,6 @@ public function get_settings() {
* @param array $account_settings The account page settings.
*/
return apply_filters( "lifterlms_{$this->id}_settings", $account_settings );

}

/**
Expand All @@ -385,7 +385,6 @@ public function get_settings() {
protected function set_label() {
return __( 'Accounts', 'lifterlms' );
}

}

return new LLMS_Settings_Accounts();
2 changes: 1 addition & 1 deletion templates/quiz/results-attempt-questions-list.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<header class="llms-quiz-attempt-question-header">
<a class="toggle-answer" href="#">

<h3 class="llms-question-title"><?php echo esc_html( $quiz_question->get_question( 'plain' ) ); ?></h3>
<h3 class="llms-question-title"><?php echo wp_kses_post( $quiz_question->get_question( 'plain' ) ); ?></h3>

<?php if ( $quiz_question->get( 'points' ) ) : ?>
<span class="llms-points">
Expand Down

0 comments on commit 5c87cac

Please sign in to comment.