MDL-26155 admin: Rebased, fixed conflicts, and fixed final admin string

diff --git a/admin/settings/mnet.php b/admin/settings/mnet.php
index a1d453a..ed77e03 100644 (file)
--- a/admin/settings/mnet.php
+++ b/admin/settings/mnet.php
@@ -23,7 +23,7 @@ if (isset($CFG->mnet_dispatcher_mode) and $CFG->mnet_dispatcher_mode !== 'off')
     $hosts = mnet_get_hosts();
     foreach ($hosts as $host) {
         if ($host->id == $CFG->mnet_all_hosts_id) {
-            $host->name = get_string('allhosts', 'core_mnet');
+            $host->name = new lang_string('allhosts', 'core_mnet');
         }
         $ADMIN->add('mnetpeercat',
             new admin_externalpage(