diff --git a/mod/glossary/comment.php b/mod/glossary/comment.php
index c917e3eef94..98fadf09085 100644
--- a/mod/glossary/comment.php
+++ b/mod/glossary/comment.php
@@ -134,7 +134,7 @@ function glossary_comment_delete() {
glossary_comment_print_header($course, $cm, $glossary, $entry, 'delete');
glossary_print_comment($course, $cm, $glossary, $entry, $comment);
- notice_yesno($strdeletewarning, $linkyes, $linkno, $optionsyes, $optionsno, 'post', 'get');
+ echo $OUTPUT->confirm($strdeletewarning, new moodle_url($linkyes, $optionsyes), new moodle_url($linkno, $optionsno));
echo $OUTPUT->footer();
die;
}
diff --git a/mod/glossary/deleteentry.php b/mod/glossary/deleteentry.php
index 6cf14a6b66a..6a61cd21fab 100644
--- a/mod/glossary/deleteentry.php
+++ b/mod/glossary/deleteentry.php
@@ -101,7 +101,7 @@
$optionsyes = array('id'=>$cm->id, 'entry'=>$entry->id, 'confirm'=>1, 'sesskey'=>sesskey(), 'prevmode'=>$prevmode, 'hook'=>$hook);
$optionsno = array('id'=>$cm->id, 'mode'=>$prevmode, 'hook'=>$hook);
- notice_yesno($areyousure, $linkyes, $linkno, $optionsyes, $optionsno, 'post', 'get');
+ echo $OUTPUT->confirm($areyousure, new moodle_url($linkyes, $optionsyes), new moodle_url($linkno, $optionsno));
echo $OUTPUT->footer();
}
diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php
index 6f8e56ffbbf..4c63875c5db 100644
--- a/mod/glossary/editcategories.php
+++ b/mod/glossary/editcategories.php
@@ -129,7 +129,7 @@
$id);
- print_single_button("editcategories.php", $options, get_string("no") );
+ echo $OUTPUT->button(html_form::make_button("editcategories.php", $options, get_string("no")));
echo "";
echo "";
echo $OUTPUT->box_end();
@@ -224,12 +224,12 @@
$options['action'] = "add";
echo "
";
- echo print_single_button("editcategories.php", $options, get_string("add") . " " . get_string("category","glossary"), "get");
+ echo $OUTPUT->button(html_form::make_button("editcategories.php", $options, get_string("add") . " " . get_string("category","glossary")));
echo " | ";
unset($options['action']);
$options['mode'] = 'cat';
$options['hook'] = $hook;
- echo print_single_button("view.php", $options, get_string("back","glossary") );
+ echo $OUTPUT->button(html_form::make_button("view.php", $options, get_string("back","glossary")));
echo " |
";
echo "
";
diff --git a/mod/glossary/exportentry.php b/mod/glossary/exportentry.php
index 6b436340e4d..20e4d145a62 100644
--- a/mod/glossary/exportentry.php
+++ b/mod/glossary/exportentry.php
@@ -80,7 +80,7 @@
$optionsyes = array('id'=>$entry->id, 'confirm'=>1, 'sesskey'=>sesskey(), 'prevmode'=>$prevmode, 'hook'=>$hook);
$optionsno = array('id'=>$cm->id, 'mode'=>$prevmode, 'hook'=>$hook);
- notice_yesno($areyousure, $linkyes, $linkno, $optionsyes, $optionsno, 'post', 'get');
+ echo $OUTPUT->confirm($areyousure, new moodle_url($linkyes, $optionsyes), new moodle_url($linkno, $optionsno));
echo '';
echo $OUTPUT->footer();
die;
diff --git a/mod/glossary/formats/TEMPLATE/TEMPLATE_format.php b/mod/glossary/formats/TEMPLATE/TEMPLATE_format.php
index 4ffa8d10208..683f482e062 100755
--- a/mod/glossary/formats/TEMPLATE/TEMPLATE_format.php
+++ b/mod/glossary/formats/TEMPLATE/TEMPLATE_format.php
@@ -1,7 +1,7 @@
get_record('user', array('id'=>$entry->userid));
@@ -15,7 +15,7 @@ function glossary_show_entry_TEMPLATE($course, $cm, $glossary, $entry, $mode='',
//Use this function to show author's image
//Comments: Configuration not supported
- print_user_picture($user, $course->id, $user->picture);
+ echo $OUTPUT->user_picture(moodle_user_picture::make($user, $course->id));
//Line separator to show this template fine. :-)
echo '
';
diff --git a/mod/glossary/formats/encyclopedia/encyclopedia_format.php b/mod/glossary/formats/encyclopedia/encyclopedia_format.php
index f96e4e9171e..0fa35331203 100644
--- a/mod/glossary/formats/encyclopedia/encyclopedia_format.php
+++ b/mod/glossary/formats/encyclopedia/encyclopedia_format.php
@@ -1,7 +1,7 @@
get_record('user', array('id'=>$entry->userid));
@@ -13,7 +13,7 @@ function glossary_show_entry_encyclopedia($course, $cm, $glossary, $entry, $mode
echo '';
echo '';
- print_user_picture($user, $course->id, $user->picture);
+ echo $OUTPUT->user_picture(moodle_user_picture::make($user, $course->id));
echo ' | ';
echo '
';
echo '';
- print_user_picture($user, $course->id, $user->picture);
+ echo $OUTPUT->user_picture(moodle_user_picture::make($user, $course->id));
echo ' | ';
echo '