From 7232e79e8e2cf335ddd75786ba4e1d60976f374b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0koda?= <commits@skodak.org>
Date: Thu, 5 Jul 2012 19:42:20 +0200
Subject: [PATCH] MDL-34175 a few more renamed admin fixes

Conflicts:

	admin/tool/assignmentupgrade/batchupgrade.php
	admin/tool/assignmentupgrade/index.php
	admin/tool/assignmentupgrade/listnotupgraded.php
	admin/tool/assignmentupgrade/upgradesingle.php
	admin/tool/assignmentupgrade/upgradesingleconfirm.php
---
 admin/settings/mnet.php        | 2 +-
 admin/tool/profiling/index.php | 2 +-
 lib/outputrenderers.php        | 2 +-
 mod/lti/typessettings.php      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/settings/mnet.php b/admin/settings/mnet.php
index dfbc57f7855..6e0259733cf 100644
--- a/admin/settings/mnet.php
+++ b/admin/settings/mnet.php
@@ -29,7 +29,7 @@ if (isset($CFG->mnet_dispatcher_mode) and $CFG->mnet_dispatcher_mode !== 'off')
             new admin_externalpage(
                 'mnetpeer' . $host->id,
                 $host->name,
-                $CFG->wwwroot . '/admin/mnet/peers.php?step=update&hostid=' . $host->id,
+                $CFG->wwwroot . '/'.$CFG->admin.'/mnet/peers.php?step=update&hostid=' . $host->id,
                 'moodle/site:config'
             )
         );
diff --git a/admin/tool/profiling/index.php b/admin/tool/profiling/index.php
index 197a6944ef2..eebfcd842e6 100644
--- a/admin/tool/profiling/index.php
+++ b/admin/tool/profiling/index.php
@@ -142,7 +142,7 @@ if (isset($script)) {
 
     // The flexitable that will root listings
     $table = new xhprof_table_sql('profiling-list-table');
-    $baseurl = $CFG->wwwroot . '/admin/tool/profiling/index.php';
+    $baseurl = $CFG->wwwroot . '/'.$CFG->admin.'/tool/profiling/index.php';
 
     // Check if we are listing all or some URL ones
     $sqlconditions = '';
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 550c567ee2d..3afdf57f217 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -398,7 +398,7 @@ class core_renderer extends renderer_base {
                 $link= '<a title="' . $title . '" href="' . $url . '">' . $txt . '</a>';
                 $output .= '<div class="profilingfooter">' . $link . '</div>';
             }
-            $output .= '<div class="purgecaches"><a href="'.$CFG->wwwroot.'/admin/purgecaches.php?confirm=1&amp;sesskey='.sesskey().'">'.get_string('purgecaches', 'admin').'</a></div>';
+            $output .= '<div class="purgecaches"><a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/purgecaches.php?confirm=1&amp;sesskey='.sesskey().'">'.get_string('purgecaches', 'admin').'</a></div>';
         }
         if (!empty($CFG->debugvalidators)) {
             $output .= '<div class="validators"><ul>
diff --git a/mod/lti/typessettings.php b/mod/lti/typessettings.php
index f88cb5eea7d..037aa509241 100644
--- a/mod/lti/typessettings.php
+++ b/mod/lti/typessettings.php
@@ -106,7 +106,7 @@ if ($data = $form->get_data()) {
 }
 
 $PAGE->set_title("$SITE->shortname: " . get_string('toolsetup', 'lti'));
-$PAGE->navbar->add(get_string('lti_administration', 'lti'), $CFG->wwwroot.'/admin/settings.php?section=modsettinglti');
+$PAGE->navbar->add(get_string('lti_administration', 'lti'), $CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=modsettinglti');
 
 echo $OUTPUT->header();
 echo $OUTPUT->heading(get_string('toolsetup', 'lti'));