From d6fc8d94e229bf3b272f44af42d1bd7b3e8d958a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0koda?= Date: Thu, 5 Jul 2012 19:42:20 +0200 Subject: [PATCH] MDL-34175 a few more renamed admin fixes --- admin/settings/mnet.php | 2 +- admin/tool/assignmentupgrade/batchupgrade.php | 6 +++--- admin/tool/assignmentupgrade/index.php | 2 +- admin/tool/assignmentupgrade/listnotupgraded.php | 8 ++++---- admin/tool/assignmentupgrade/upgradesingle.php | 2 +- admin/tool/assignmentupgrade/upgradesingleconfirm.php | 2 +- admin/tool/profiling/index.php | 2 +- lib/outputrenderers.php | 2 +- mod/lti/typessettings.php | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/admin/settings/mnet.php b/admin/settings/mnet.php index ed77e03ec80..9bb5b15dd4a 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/assignmentupgrade/batchupgrade.php b/admin/tool/assignmentupgrade/batchupgrade.php index 31bca246490..a654f6e93c5 100644 --- a/admin/tool/assignmentupgrade/batchupgrade.php +++ b/admin/tool/assignmentupgrade/batchupgrade.php @@ -26,9 +26,9 @@ define('NO_OUTPUT_BUFFERING', true); require_once(dirname(__FILE__) . '/../../../config.php'); require_once($CFG->libdir . '/adminlib.php'); -require_once($CFG->dirroot . '/admin/tool/assignmentupgrade/locallib.php'); -require_once($CFG->dirroot . '/admin/tool/assignmentupgrade/upgradableassignmentstable.php'); -require_once($CFG->dirroot . '/admin/tool/assignmentupgrade/upgradableassignmentsbatchform.php'); +require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/locallib.php'); +require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/upgradableassignmentstable.php'); +require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/upgradableassignmentsbatchform.php'); require_sesskey(); diff --git a/admin/tool/assignmentupgrade/index.php b/admin/tool/assignmentupgrade/index.php index f4cd1797d73..71ed56f4444 100644 --- a/admin/tool/assignmentupgrade/index.php +++ b/admin/tool/assignmentupgrade/index.php @@ -35,7 +35,7 @@ require_once(dirname(__FILE__) . '/../../../config.php'); require_once($CFG->libdir . '/adminlib.php'); -require_once($CFG->dirroot . '/admin/tool/assignmentupgrade/locallib.php'); +require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/locallib.php'); // admin_externalpage_setup calls require_login and checks moodle/site:config admin_externalpage_setup('assignmentupgrade'); diff --git a/admin/tool/assignmentupgrade/listnotupgraded.php b/admin/tool/assignmentupgrade/listnotupgraded.php index b03883adf4a..9d68c262fe6 100644 --- a/admin/tool/assignmentupgrade/listnotupgraded.php +++ b/admin/tool/assignmentupgrade/listnotupgraded.php @@ -24,10 +24,10 @@ require_once(dirname(__FILE__) . '/../../../config.php'); require_once($CFG->libdir . '/adminlib.php'); -require_once($CFG->dirroot . '/admin/tool/assignmentupgrade/locallib.php'); -require_once($CFG->dirroot . '/admin/tool/assignmentupgrade/upgradableassignmentstable.php'); -require_once($CFG->dirroot . '/admin/tool/assignmentupgrade/upgradableassignmentsbatchform.php'); -require_once($CFG->dirroot . '/admin/tool/assignmentupgrade/paginationform.php'); +require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/locallib.php'); +require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/upgradableassignmentstable.php'); +require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/upgradableassignmentsbatchform.php'); +require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/paginationform.php'); // admin_externalpage_setup calls require_login and checks moodle/site:config admin_externalpage_setup('assignmentupgrade', '', array(), tool_assignmentupgrade_url('listnotupgraded')); diff --git a/admin/tool/assignmentupgrade/upgradesingle.php b/admin/tool/assignmentupgrade/upgradesingle.php index 5125bbbfa66..67f24b0cd46 100644 --- a/admin/tool/assignmentupgrade/upgradesingle.php +++ b/admin/tool/assignmentupgrade/upgradesingle.php @@ -24,7 +24,7 @@ require_once(dirname(__FILE__) . '/../../../config.php'); require_once($CFG->libdir . '/adminlib.php'); -require_once($CFG->dirroot . '/admin/tool/assignmentupgrade/locallib.php'); +require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/locallib.php'); require_sesskey(); diff --git a/admin/tool/assignmentupgrade/upgradesingleconfirm.php b/admin/tool/assignmentupgrade/upgradesingleconfirm.php index b7ec24c52e9..143ebf111c6 100644 --- a/admin/tool/assignmentupgrade/upgradesingleconfirm.php +++ b/admin/tool/assignmentupgrade/upgradesingleconfirm.php @@ -24,7 +24,7 @@ require_once(dirname(__FILE__) . '/../../../config.php'); require_once($CFG->libdir . '/adminlib.php'); -require_once($CFG->dirroot . '/admin/tool/assignmentupgrade/locallib.php'); +require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/locallib.php'); require_sesskey(); 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 9654364419b..b2d0e491005 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -468,7 +468,7 @@ class core_renderer extends renderer_base { $link= '' . $txt . ''; $output .= '
' . $link . '
'; } - $output .= '
'.get_string('purgecaches', 'admin').'
'; + $output .= '
'.get_string('purgecaches', 'admin').'
'; } if (!empty($CFG->debugvalidators)) { // NOTE: this is not a nice hack, $PAGE->url is not always accurate and $FULLME neither, it is not a bug if it fails. --skodak 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'));