Skip to content

Commit fd0ee12

Browse files
author
Chris Gårdenberg
committed
fix(Programme): Fixed an issue where programme views/shortcodes weren't included in the correct way.
fixes #494
1 parent d0cf48b commit fd0ee12

3 files changed

Lines changed: 16 additions & 3 deletions

File tree

PLUGIN-CHECKSUM

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6e94e3062bad0f92f73cb3a6950f6e11
1+
aa4d899950d162a8261ab42e4dffcf4d

includes/edu-shortcodes.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ function eduadmin_get_detailinfo( $attributes ) {
594594

595595
if ( $use_eduadmin_form ) {
596596
if ( ! key_exists( 'eduadmin-booking-form-javascript-set', $GLOBALS ) && ! empty( trim( EDU()->get_option( 'eduadmin-booking-form-javascript', '' ) ) ) ) {
597-
$ret_str .= '<script type="text/javascript">' . EDU()->get_option( 'eduadmin-booking-form-javascript', '' ) . '</script>';
597+
$ret_str .= '<script type="text/javascript">' . EDU()->get_option( 'eduadmin-booking-form-javascript', '' ) . '</script>';
598598
$GLOBALS['eduadmin-booking-form-javascript-set'] = true;
599599
}
600600
}
@@ -660,7 +660,10 @@ function eduadmin_get_login_view( $attributes ) {
660660
);
661661
EDU()->stop_timer( $t );
662662

663-
return include_once EDUADMIN_PLUGIN_PATH . '/content/template/myPagesTemplate/login.php';
663+
ob_start();
664+
include_once EDUADMIN_PLUGIN_PATH . '/content/template/myPagesTemplate/login.php';
665+
666+
return ob_get_clean();
664667
}
665668

666669
function eduadmin_get_programme_list( $attributes ) {
@@ -695,7 +698,10 @@ function eduadmin_get_programme_list( $attributes ) {
695698
'StartDate),Courses'
696699
);
697700

701+
ob_start();
698702
include_once EDUADMIN_PLUGIN_PATH . '/content/template/programme/list.php';
703+
704+
return ob_get_clean();
699705
}
700706

701707
function eduadmin_get_programme_details( $attributes ) {
@@ -745,7 +751,10 @@ function eduadmin_get_programme_details( $attributes ) {
745751
'),PriceNames'
746752
);
747753

754+
ob_start();
748755
include_once EDUADMIN_PLUGIN_PATH . '/content/template/programme/detail.php';
756+
757+
return ob_get_clean();
749758
}
750759
}
751760

@@ -793,7 +802,10 @@ function eduadmin_get_programme_booking( $attributes ) {
793802
'Courses,Events,PaymentMethods,PriceNames'
794803
);
795804

805+
ob_start();
796806
include_once EDUADMIN_PLUGIN_PATH . '/content/template/programme/book.php';
807+
808+
return ob_get_clean();
797809
}
798810
}
799811

src/scss/frontend/listProgrammeView.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@
3232
}
3333
}
3434
}
35+

0 commit comments

Comments
 (0)