MDL-19822 upgraded calls to print_table, print_single_button, print_user_picture...

diff --git a/search/query.php b/search/query.php
index 269f1fd7b765c53bdcea0611da71644b09262610..55253859e319f4c388e8fc57e15211720a080027 100644 (file)
--- a/search/query.php
+++ b/search/query.php
@@ -334,7 +334,7 @@
             foreach ($hits as $listing) {
 
                 if ($listing->doctype == 'user'){ // A special handle for users
-                    $icon = print_user_picture ($listing->userid, 0, true, 0, true, false) ;
+                    $icon = $OUTPUT->user_picture(moodle_user_picture($listing->userid, 0));
                 } else {
                     $iconpath = $OUTPUT->mod_icon_url('icon', $listing->doctype);
                     $icon = "<img align=\"top\" src=\"".$iconpath."\" class=\"activityicon\" alt=\"\"/>";

diff --git a/search/stats.php b/search/stats.php
index 6fea080459cee850b3c2201e60d577fde7651973..995929ace32816c88f0126603beebfd4b5449454 100644 (file)
--- a/search/stats.php
+++ b/search/stats.php
@@ -78,6 +78,7 @@ require_once($CFG->dirroot.'/search/lib.php');
         $runindexerteststr = get_string('runindexertest', 'search');
         $runindexerstr = get_string('runindexer', 'search');
 
+        $admin_table = new html_table();
         $admin_table->tablealign = 'center';
         $admin_table->align = array ('right', 'left');
         $admin_table->wrap = array ('nowrap', 'nowrap');
@@ -103,7 +104,7 @@ require_once($CFG->dirroot.'/search/lib.php');
             }
         }
 
-        print_table($admin_table);
+        echo $OUTPUT->table($admin_table);
         $spacer = new html_image();
         $spacer->height = 20;
         echo $OUTPUT->spacer(clone($spacer)) . '<br />';
@@ -120,13 +121,14 @@ require_once($CFG->dirroot.'/search/lib.php');
         $admin_table->data[] = array($runindexerteststr, '<a href="tests/index.php" target="_blank">tests/index.php</a>');
         $admin_table->data[] = array($runindexerstr, '<a href="indexersplash.php" target="_blank">indexersplash.php</a>');
 
-        print_table($admin_table);
+        echo $OUTPUT->table($admin_table);
         echo $OUTPUT->spacer($spacer) . '<br />';
         print_spacer(20);
     }
 
 /// this is the standard summary table for normal users, shows document counts
 
+    $table = new html_table();
     $table->tablealign = 'center';
     $table->align = array ('right', 'left');
     $table->wrap = array ('nowrap', 'nowrap');
@@ -161,7 +163,7 @@ require_once($CFG->dirroot.'/search/lib.php');
     }
 
     echo $OUTPUT->heading($databasestatestr);
-    print_table($table);
+    echo $OUTPUT->table($table);
 
     echo $OUTPUT->box_end();
     echo $OUTPUT->box_end();