From: nicolasconnault <nicolasconnault>
Date: Thu, 6 Aug 2009 08:23:39 +0000 (+0000)
Subject: MDL-19809 Migrated calls to print_heading
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=2d8e042e92e50e351307a08ac14f506e56668cb2;p=moodle.git

MDL-19809 Migrated calls to print_heading
---

diff --git a/mod/glossary/comments.php b/mod/glossary/comments.php
index 1019a7f604..1aa16e1736 100644
--- a/mod/glossary/comments.php
+++ b/mod/glossary/comments.php
@@ -53,10 +53,10 @@
 
 /// comments
 
-    print_heading(format_string(get_string('commentson','glossary')." <b>\"$entry->concept\"</b>"));
+    echo $OUTPUT->heading(format_string(get_string('commentson','glossary')." <b>\"$entry->concept\"</b>"));
 
     if (has_capability('mod/glossary:comment', $context) and $glossary->allowcomments) {
-        print_heading("<a href=\"comment.php?action=add&amp;entryid=$entry->id\">$straddcomment <img title=\"$straddcomment\" src=\"comment.gif\" class=\"iconsmall\" alt=\"$straddcomment\" /></a>");
+        echo $OUTPUT->heading("<a href=\"comment.php?action=add&amp;entryid=$entry->id\">$straddcomment <img title=\"$straddcomment\" src=\"comment.gif\" class=\"iconsmall\" alt=\"$straddcomment\" /></a>");
     }
 
     if ($comments = $DB->get_records("glossary_comments", array("entryid"=>$entry->id), "timemodified ASC")) {
@@ -65,7 +65,7 @@
             echo '<br />';
         }
     } else {
-        print_heading(get_string("nocomments","glossary"));
+        echo $OUTPUT->heading(get_string("nocomments","glossary"));
     }
 
 
diff --git a/mod/glossary/edit.php b/mod/glossary/edit.php
index 3e1406afec..ddaa2bb67e 100644
--- a/mod/glossary/edit.php
+++ b/mod/glossary/edit.php
@@ -169,7 +169,7 @@ $navigation = build_navigation($stredit, $cm);
 print_header_simple(format_string($glossary->name), "", $navigation, "",
               "", true, "", navmenu($course, $cm));
 
-print_heading(format_string($glossary->name));
+echo $OUTPUT->heading(format_string($glossary->name));
 
 $mform->display();
 
diff --git a/mod/glossary/export.php b/mod/glossary/export.php
index dfe9d5aa1f..19cc3fde53 100644
--- a/mod/glossary/export.php
+++ b/mod/glossary/export.php
@@ -42,7 +42,7 @@
         "", "", true, update_module_button($cm->id, $course->id, $strglossary),
         navmenu($course, $cm));
 
-    print_heading($strexportentries);
+    echo $OUTPUT->heading($strexportentries);
 
     print_box_start('glossarydisplay generalbox');
     ?>
diff --git a/mod/glossary/formats.php b/mod/glossary/formats.php
index 47fd883e65..c285abe2a5 100644
--- a/mod/glossary/formats.php
+++ b/mod/glossary/formats.php
@@ -45,7 +45,7 @@
 
     admin_externalpage_print_header();
 
-    print_heading($strmodulename . ': ' . get_string("displayformats","glossary"));
+    echo $OUTPUT->heading($strmodulename . ': ' . get_string("displayformats","glossary"));
 
     print_simple_box("<center>".get_string("configwarning", 'admin')."</center>", "center", "60%");
     echo "<br />";
diff --git a/mod/glossary/import.php b/mod/glossary/import.php
index 89a22126ec..f6353f15ae 100644
--- a/mod/glossary/import.php
+++ b/mod/glossary/import.php
@@ -49,7 +49,7 @@
         "", "", true, update_module_button($cm->id, $course->id, $strglossary),
         navmenu($course, $cm));
 
-    print_heading($strimportentries);
+    echo $OUTPUT->heading($strimportentries);
 
     if ( !$step ) {
         print_box_start('glossarydisplay generalbox');
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index fe76348ab4..6963335fbb 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -796,9 +796,10 @@ function glossary_print_entry_default ($entry, $glossary, $cm) {
  * @param object $entry
  */
 function  glossary_print_entry_concept($entry) {
+    global $OUTPUT;
     $options = new object();
     $options->para = false;
-    $text = format_text(print_heading('<span class="nolink">' . $entry->concept . '</span>', '', 3, 'nolink', true), FORMAT_MOODLE, $options);
+    $text = format_text($OUTPUT->heading('<span class="nolink">' . $entry->concept . '</span>', 3, 'nolink'), FORMAT_MOODLE, $options);
     if (!empty($entry->highlight)) {
         $text = highlight($entry->highlight, $text);
     }
diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index e7235be575..4d3a55dcf3 100644
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -233,7 +233,7 @@
         print_header_simple(format_string($glossary->name), "", $navigation, "", "", true,
             update_module_button($cm->id, $course->id, $strglossary), navmenu($course, $cm));
 
-        print_heading($strwaitingapproval);
+        echo $OUTPUT->heading($strwaitingapproval);
     } else { /// Print standard header
         $navigation = build_navigation('', $cm);
         print_header_simple(format_string($glossary->name), "", $navigation, "", "", true,
@@ -447,7 +447,7 @@
                         echo '<th >';
                     }
 
-                    print_heading($pivottoshow);
+                    echo $OUTPUT->heading($pivottoshow);
                     echo "</th></tr></table></div>\n";
 
                 }