From c4238816f08ff41b45113fd3c4725ff24aeb9655 Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Wed, 22 Sep 2010 07:55:34 +0000 Subject: [PATCH] mod-wiki MDL-19817 Tidied up some deprecated calls --- mod/wiki/editors/html.php | 7 +++---- mod/wiki/pagelib.php | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mod/wiki/editors/html.php b/mod/wiki/editors/html.php index bdefffaf6bc..174a1efd4c3 100644 --- a/mod/wiki/editors/html.php +++ b/mod/wiki/editors/html.php @@ -24,11 +24,10 @@ function wiki_print_editor_html($pageid, $content, $version = -1, $section = nul $action .= "§ion=".urlencode($section); } - print_container_start(false, 'mdl-align'); + echo $OUTPUT->container_start('mdl-align'); echo '
'; - print_container(print_textarea(true, 20, 100, 0, 0, "newcontent", $content, 0, true, '', 'form-textarea-advanced'), false, 'wiki_editor'); + echo $OUTPUT->container(print_textarea(true, 20, 100, 0, 0, "newcontent", $content, 0, true, '', 'form-textarea-advanced'), 'wiki_editor'); wiki_print_edit_form_default_fields('html', $pageid, $version, $upload, $deleteuploads); echo '
'; - - print_container_end(); + echo $OUTPUT->container_end(); } diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php index e7e11f836e4..a04a68ea9f8 100644 --- a/mod/wiki/pagelib.php +++ b/mod/wiki/pagelib.php @@ -1229,7 +1229,7 @@ class page_wiki_history extends page_wiki { $versionid = wiki_get_version($row->id); $versionlink = new moodle_url('/mod/wiki/viewversion.php', array('pageid' => $pageid, 'versionid' => $versionid->id)); $userlink = new moodle_url('/user/view.php', array('id' => $username->id)); - $contents[] = array('', html_writer::link($versionlink->out(false), $row->version), $picture . html_writer::link($userlink->out(false), fullname($username)), $time, print_container($date, false, 'wiki_histdate', '', true)); + $contents[] = array('', html_writer::link($versionlink->out(false), $row->version), $picture . html_writer::link($userlink->out(false), fullname($username)), $time, $OUTPUT->container($date, 'wiki_histdate')); $table = new html_table(); $table->head = array('', get_string('version'), get_string('user'), get_string('modified'), ''); @@ -1264,7 +1264,7 @@ class page_wiki_history extends page_wiki { $viewlink = $version->version; } $userlink = new moodle_url('/user/view.php', array('id' => $version->userid)); - $contents[] = array($this->choose_from_radio(array($version->version => null), 'compare', 'M.mod_wiki.history()', $checked - 1, true) . $this->choose_from_radio(array($version->version => null), 'comparewith', 'M.mod_wiki.history()', $checked, true), $viewlink, $picture . html_writer::link($userlink->out(false), fullname($user)), $time, print_container($date, false, 'wiki_histdate', '', true)); + $contents[] = array($this->choose_from_radio(array($version->version => null), 'compare', 'M.mod_wiki.history()', $checked - 1, true) . $this->choose_from_radio(array($version->version => null), 'comparewith', 'M.mod_wiki.history()', $checked, true), $viewlink, $picture . html_writer::link($userlink->out(false), fullname($user)), $time, $OUTPUT->container($date, 'wiki_histdate')); } $table = new html_table();