← All changes
|
inc/TemplateHooks/Course/SingleCourseModernLayout.php
+13
-13
4.4.0
→
4.4.8
View file →
| @@ -25,9 +25,9 @@ | ||
| 25 | 25 | * @var SingleCourseTemplate |
| 26 | 26 | */ |
| 27 | 27 | public $singleCourseTemplate; |
| 28 | 28 | |
| 29 | - public function init() { | |
| 29 | + public function init(): void { | |
| 30 | 30 | $this->singleCourseTemplate = SingleCourseTemplate::instance(); |
| 31 | 31 | |
| 32 | 32 | add_action( |
| 33 | 33 | 'learn-press/single-course/layout', |
| @@ -53,13 +53,8 @@ | ||
| 53 | 53 | ob_start(); |
| 54 | 54 | do_action( 'learn-press/single-course/courses-related/layout', $course, 4 ); |
| 55 | 55 | $html_courses_related = ob_get_clean(); |
| 56 | 56 | |
| 57 | - // Global message | |
| 58 | - ob_start(); | |
| 59 | - learn_press_show_message(); | |
| 60 | - $global_message = ob_get_clean(); | |
| 61 | - | |
| 62 | 57 | $sections = apply_filters( |
| 63 | 58 | 'learn-press/single-course/modern/sections', |
| 64 | 59 | [ |
| 65 | 60 | 'wrapper' => '<div class="lp-single-course">', |
| @@ -65,9 +60,8 @@ | ||
| 65 | 60 | 'wrapper' => '<div class="lp-single-course">', |
| 66 | 61 | 'section_header' => $this->header_sections( $course, $user ), |
| 67 | 62 | 'wrapper_container' => '<div class="lp-content-area">', |
| 68 | 63 | 'wrapper_main' => '<div class="lp-single-course-main">', |
| 69 | - 'global_message' => $global_message, | |
| 70 | 64 | 'section_left' => $this->section_left( $course, $user ), |
| 71 | 65 | 'section_right' => $this->section_right( $course, $user ), |
| 72 | 66 | 'wrapper_main_end' => '</div>', |
| 73 | 67 | 'related_courses' => $html_courses_related, |
| @@ -158,12 +152,18 @@ | ||
| 158 | 152 | * |
| 159 | 153 | * @return string |
| 160 | 154 | */ |
| 161 | 155 | public function section_left( $course, $user ): string { |
| 156 | + // Global message | |
| 157 | + ob_start(); | |
| 158 | + learn_press_show_message(); | |
| 159 | + $global_message = ob_get_clean(); | |
| 160 | + | |
| 162 | 161 | $section = apply_filters( |
| 163 | 162 | 'learn-press/single-course/modern/section_left', |
| 164 | 163 | [ |
| 165 | 164 | 'wrapper' => '<div class="lp-single-course-main__left">', |
| 165 | + 'global_message' => $global_message, | |
| 166 | 166 | 'description' => $this->singleCourseTemplate->html_description( $course ), |
| 167 | 167 | 'features' => $this->singleCourseTemplate->html_features( $course ), |
| 168 | 168 | 'target' => $this->singleCourseTemplate->html_target( $course ), |
| 169 | 169 | 'requirements' => $this->singleCourseTemplate->html_requirements( $course ), |
| @@ -364,13 +364,13 @@ | ||
| 364 | 364 | $clipboard = [ |
| 365 | 365 | 'wrapper' => '<div class="clipboard-post">', |
| 366 | 366 | 'input' => sprintf( |
| 367 | 367 | '<input class="clipboard-value" type="text" value="%s">', |
| 368 | - $courseModel->get_permalink() | |
| 368 | + esc_url( $courseModel->get_permalink() ) | |
| 369 | 369 | ), |
| 370 | 370 | 'button' => sprintf( |
| 371 | 371 | '<button class="btn-clipboard" data-copied="%s">%s<span class="tooltip">%s</span></button>', |
| 372 | - esc_html__( 'Copied!', 'learnpress' ), | |
| 372 | + esc_attr__( 'Copied!', 'learnpress' ), | |
| 373 | 373 | esc_html__( 'Copy', 'learnpress' ), |
| 374 | 374 | esc_html__( 'Copy to Clipboard', 'learnpress' ) |
| 375 | 375 | ), |
| 376 | 376 | 'wrapper_end' => '</div>', |
| @@ -422,10 +422,10 @@ | ||
| 422 | 422 | } |
| 423 | 423 | |
| 424 | 424 | $html_instructor_image = sprintf( |
| 425 | 425 | '<a href="%s" title="%s">%s</a>', |
| 426 | - $author->get_url_instructor(), | |
| 427 | - $author->get_display_name(), | |
| 426 | + esc_url( $author->get_url_instructor() ), | |
| 427 | + esc_attr( $author->get_display_name() ), | |
| 428 | 428 | $singleInstructorTemplate->html_avatar( $author ) |
| 429 | 429 | ); |
| 430 | 430 | $section_instructor_meta = [ |
| 431 | 431 | 'wrapper' => '<div class="lp-instructor-meta">', |
| @@ -444,9 +444,9 @@ | ||
| 444 | 444 | [ |
| 445 | 445 | 'wrapper' => '<div class="lp-section-instructor">', |
| 446 | 446 | 'name' => sprintf( |
| 447 | 447 | '<a href="%s">%s</a>', |
| 448 | - $author->get_url_instructor(), | |
| 448 | + esc_url( $author->get_url_instructor() ), | |
| 449 | 449 | $singleInstructorTemplate->html_display_name( $author ) |
| 450 | 450 | ), |
| 451 | 451 | 'meta' => Template::combine_components( $section_instructor_meta ), |
| 452 | 452 | 'description' => $singleInstructorTemplate->html_description( $author ), |
| @@ -528,9 +528,9 @@ | ||
| 528 | 528 | $will_end_date = new LP_Datetime( strtotime( "+ $duration", strtotime( $started_date ) ) ); |
| 529 | 529 | $will_end_date = $will_end_date->format( LP_Datetime::I18N_FORMAT ); |
| 530 | 530 | $html_will_end_date = sprintf( |
| 531 | 531 | '<div class="will-end-date">%s: %s</div>', |
| 532 | - esc_html__( 'Will end date', 'learnpress' ), | |
| 532 | + esc_html__( 'Expiry date', 'learnpress' ), | |
| 533 | 533 | $will_end_date |
| 534 | 534 | ); |
| 535 | 535 | } |
| 536 | 536 | |