Skip to content

Commit 5d0e50e

Browse files
authored
Merge pull request #501 from slackday/fix/login-shortcode-empty
Fix [eduadmin-loginview] shortcode
2 parents e701def + b5d5adf commit 5d0e50e

2 files changed

Lines changed: 4 additions & 9 deletions

File tree

content/template/myPagesTemplate/login.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@
1919
require_once 'profile.php';
2020
}
2121
} else {
22-
if ( isset( $q['edu-login'] ) ) {
23-
require_once 'login-page.php';
24-
} else {
25-
require_once 'login-page.php';
26-
}
22+
require_once 'login-page.php';
2723
}
2824

2925
$out = ob_get_clean();

includes/edu-shortcodes.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -658,12 +658,11 @@ function eduadmin_get_login_view( $attributes ) {
658658
normalize_empty_atts( $attributes ),
659659
'eduadmin-loginview'
660660
);
661-
EDU()->stop_timer( $t );
662661

663-
ob_start();
664-
include_once EDUADMIN_PLUGIN_PATH . '/content/template/myPagesTemplate/login.php';
662+
$str = include_once EDUADMIN_PLUGIN_PATH . '/content/template/myPagesTemplate/login.php';
663+
EDU()->stop_timer( $t );
665664

666-
return ob_get_clean();
665+
return $str;
667666
}
668667

669668
function eduadmin_get_programme_list( $attributes ) {

0 commit comments

Comments
 (0)