MDL-17758 fixed hardcoded /admin/ links

diff --git a/admin/cliupgrade.php b/admin/cliupgrade.php
index 7cd87ded5c2721e28b91511482e5d4dc275b8410..7839192389ffafe77d18376f90eac135fe6ce530 100644 (file)
--- a/admin/cliupgrade.php
+++ b/admin/cliupgrade.php
@@ -328,14 +328,14 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
     /// check wwwroot
     if (ini_get('allow_url_fopen') && false) {  /// This was not reliable
-        if (($fh = @fopen($INSTALL['wwwroot'].'/admin/cliupgrade.php', 'r')) === false) {
+        if (($fh = @fopen($INSTALL['wwwroot']."/$CFG->admin/cliupgrade.php", 'r')) === false) {
             console_write(STDERR,get_string('wwwrooterror'),'install',false);
         }
     }
     if (isset($fh)) fclose($fh);
 
     /// check dirroot
-    if (($fh = @fopen($INSTALL['dirroot'].'/admin/cliupgrade.php', 'r')) === false ) {
+    if (($fh = @fopen($INSTALL['dirroot']."/$CFG->admin/cliupgrade.php", 'r')) === false ) {
         console_write(STDERR,get_string('dirrooterror'),'install',false);
     }
     if (isset($fh)) fclose($fh);
@@ -1043,7 +1043,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
     upgrade_local_db('');  // Don't return anywhere
 
     /// Check for changes to RPC functions
-    require_once($CFG->dirroot.'/admin/mnet/adminlib.php');
+    require_once("$CFG->dirroot/$CFG->admin/mnet/adminlib.php");
     if ( $verbose > CLI_NO ) {
         print_heading(get_string('upgradingrpcfunctions','install'),'',1);
     }

diff --git a/admin/portfolio.php b/admin/portfolio.php
index fd36268b3dea0c60ee8b2840160f929475385ecd..d79367fa13605d2cb61af5179de6096ae51c08b5 100644 (file)
--- a/admin/portfolio.php
+++ b/admin/portfolio.php
@@ -28,9 +28,9 @@ admin_externalpage_setup($pagename);
 require_login(SITEID, false);
 require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
-$baseurl = $CFG->wwwroot . '/admin/settings.php?section=manageportfolios';
-$sesskeyurl = $CFG->wwwroot . '/' . $CFG->admin . '/portfolio.php?sesskey=' . sesskey();
-$configstr = get_string('manageportfolios', 'portfolio');
+$baseurl    = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageportfolios";
+$sesskeyurl = "$CFG->wwwroot/$CFG->admin/portfolio.php?sesskey=" . sesskey();
+$configstr  = get_string('manageportfolios', 'portfolio');
 
 $return = true; // direct back to the main page
 

diff --git a/admin/report/capability/index.php b/admin/report/capability/index.php
index a1482e7bb58bdb140726adb2e74c201ae626a676..1a6aab4711c4a598fd5c61c8b6fcdcc6d8329fea 100644 (file)
--- a/admin/report/capability/index.php
+++ b/admin/report/capability/index.php
@@ -177,10 +177,10 @@ function print_report_tree($contextid, $contexts, $allroles) {
     // Start the list item, and print the context name as a link to the place to
     // make changes.
     if ($contextid == get_system_context()->id) {
-        $url = $CFG->wwwroot . '/admin/roles/manage.php';
+        $url = "$CFG->wwwroot/$CFG->admin/roles/manage.php";
         $title = get_string('changeroles', 'report_capability');
     } else {
-        $url = $CFG->wwwroot . '/admin/roles/override.php?contextid=' . $contextid;
+        $url = "$CFG->wwwroot/$CFG->admin/roles/override.php?contextid=$contextid";
         $title = get_string('changeoverrides', 'report_capability');
     }
     echo '<h3><a href="' . $url . '" title="' . $title . '">', print_context_name($contexts[$contextid]), '</a></h3>';

diff --git a/admin/report/unittest/index.php b/admin/report/unittest/index.php
index 53560ad65c4f03ab19cc6932d4a80df25425055b..e0ad35dc8556ae7a7d63265d9a8b63de0d9723c6 100644 (file)
--- a/admin/report/unittest/index.php
+++ b/admin/report/unittest/index.php
@@ -46,7 +46,7 @@ if ($testtablesok) {
     print_heading(get_string('testtablesok', 'simpletest'));
 }
 
-$baseurl = $CFG->wwwroot . '/admin/report/unittest/index.php';
+$baseurl = "$CFG->wwwroot/$CFG->admin/report/unittest/index.php";
 
 // Add unittest prefix to config.php if needed
 if ($addconfigprefix && !isset($CFG->unittestprefix)) {

diff --git a/admin/repository.php b/admin/repository.php
index 88a732d631a47cbb24e54e9212a11de56cebf246..9d3876d600f8645736d394ffff6ed0d051e9ffb0 100644 (file)
--- a/admin/repository.php
+++ b/admin/repository.php
@@ -30,8 +30,8 @@ admin_externalpage_setup($pagename);
 require_login(SITEID, false);
 require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
-$sesskeyurl = $CFG->wwwroot . '/' . $CFG->admin . '/repository.php?sesskey=' . sesskey();
-$baseurl    = $CFG->wwwroot . '/admin/settings.php?section=managerepositories';
+$sesskeyurl = "$CFG->wwwroot/$CFG->admin/repository.php?sesskey=" . sesskey();
+$baseurl    = "$CFG->wwwroot/$CFG->admin/settings.php?section=managerepositories";
 
 $configstr  = get_string('managerepositories', 'repository');
 

diff --git a/admin/repositoryinstance.php b/admin/repositoryinstance.php
index 62800563e27258dcbeca5f85607c1468a23f8830..b6fa19320e764b646461a0225492ee6d5061d4ae 100644 (file)
--- a/admin/repositoryinstance.php
+++ b/admin/repositoryinstance.php
@@ -28,8 +28,8 @@ admin_externalpage_setup($pagename);
 require_login(SITEID, false);
 require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
-$sesskeyurl = $CFG->wwwroot . '/' . $CFG->admin . '/repositoryinstance.php?sesskey=' . sesskey();
-$baseurl    = $CFG->wwwroot . '/admin/repository.php?session='. sesskey() .'&edit=';
+$sesskeyurl = "$CFG->wwwroot/$CFG->admin/repositoryinstance.php?sesskey=" . sesskey();
+$baseurl    = "$CFG->wwwroot/$CFG->admin/repository.php?session=". sesskey() .'&edit=';
 if ($new) {
     $baseurl .= $new;
 }
@@ -124,7 +124,7 @@ if (!empty($edit) || !empty($new)) {
         }
         exit;
     }
-    notice_yesno(get_string('confirmdelete', 'repository', $instance->name), $sesskeyurl . '&type=' . $type . '&delete=' . $delete . '&sure=yes', $CFG->wwwroot . '/admin/repositoryinstance.php?session='. sesskey());
+    notice_yesno(get_string('confirmdelete', 'repository', $instance->name), $sesskeyurl . '&type=' . $type . '&delete=' . $delete . '&sure=yes', "$CFG->wwwroot/$CFG->admin/repositoryinstance.php?session=". sesskey());
     $return = false;
 }
 

diff --git a/admin/roles/tabs.php b/admin/roles/tabs.php
index 830004dcc4a6b7dcc7e7635c952702185039a532..c86fe4edfc547c1ecd5628fc90967ccb5a703d8e 100755 (executable)
--- a/admin/roles/tabs.php
+++ b/admin/roles/tabs.php
@@ -80,7 +80,7 @@ if ($currenttab != 'update') {
 
                 require_login($course);
                 $navlinks[] = array('name' => get_string('roles'),
-                                    'link' => "$CFG->wwwroot/admin/roles/assign.php?contextid=$context->id",
+                                    'link' => "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=$context->id",
                                     'type' => 'misc');
                 $navigation = build_navigation($navlinks);
                 if (empty($title)) {

diff --git a/course/lib.php b/course/lib.php
index 42b8090d0679784478e6ab99a68b5ac135c6beb1..9046e262dd22e0fdd1c7cb8267efa991a2c4ac09 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -2961,7 +2961,7 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
     }
     if (has_capability('moodle/course:managegroups', $modcontext)){
         $context = get_context_instance(CONTEXT_MODULE, $mod->id);
-        $assign = '<a class="editing_assign" title="'.$str->assign.'" href="'.$CFG->wwwroot.'/admin/roles/assign.php?contextid='.
+        $assign = '<a class="editing_assign" title="'.$str->assign.'" href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.
             $context->id.'"><img src="'.$CFG->pixpath.'/i/roles.gif" alt="'.$str->assign.'" class="iconsmall"/></a>';
     } else {
         $assign = '';

diff --git a/grade/edit/settings/form.php b/grade/edit/settings/form.php
index bf3b5ae7eb81fb5f56e81c74f7f9235fb4955f0e..8de83303bb977571d134ec14b8797a302ef06e99 100644 (file)
--- a/grade/edit/settings/form.php
+++ b/grade/edit/settings/form.php
@@ -46,7 +46,7 @@ class course_settings_form extends moodleform {
         $strchangedefaults = get_string('changedefaults', 'grades');
         $mform->addElement('header', 'general', get_string('generalsettings', 'grades'));
         if ($can_view_admin_links) {
-            $link = '<a href="' . $CFG->wwwroot . '/admin/settings.php?section=gradessettings">' . $strchangedefaults . '</a>';
+            $link = '<a href="' . $CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=gradessettings">' . $strchangedefaults . '</a>';
             $mform->addElement('static', 'generalsettingslink', $link);
         }
         $options = array(-1                                      => get_string('default', 'grades'),
@@ -65,7 +65,7 @@ class course_settings_form extends moodleform {
         // Grade item settings
         $mform->addElement('header', 'grade_item_settings', get_string('gradeitemsettings', 'grades'));
         if ($can_view_admin_links) {
-            $link = '<a href="' . $CFG->wwwroot . '/admin/settings.php?section=gradeitemsettings">' . $strchangedefaults . '</a>';
+            $link = '<a href="' . $CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=gradeitemsettings">' . $strchangedefaults . '</a>';
             $mform->addElement('static', 'gradeitemsettingslink', $link);
         }
 
@@ -100,7 +100,7 @@ class course_settings_form extends moodleform {
                     if (function_exists($functionname)) {
                         $mform->addElement('header', 'grade_'.$type.$plugin, get_string('modulename', 'grade'.$type.'_'.$plugin, NULL, $CFG->dirroot.'/grade/'.$type.'/'.$plugin.'/lang/'));
                         if ($can_view_admin_links) {
-                            $link = '<a href="' . $CFG->wwwroot . '/admin/settings.php?section=gradereport' . $plugin . '">' . $strchangedefaults . '</a>';
+                            $link = '<a href="' . $CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=gradereport' . $plugin . '">' . $strchangedefaults . '</a>';
                             $mform->addElement('static', 'gradeitemsettingslink', $link);
                         }
                         $functionname($mform);

diff --git a/lib/adminlib.php b/lib/adminlib.php
index dbf59e2e8623a05ad5673024b2dc4c940bd430fb..8cd4178ebc18124482440d56bf366d1ea8dff2ca 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -1422,7 +1422,7 @@ function create_admin_user($user_input=NULL) {
               redirect("$CFG->wwwroot/user/editadvanced.php?id=$user->id");  // Edit thyself
             }
         } else {
-            redirect("$CFG->wwwroot/admin/report/unittest/index.php?testtablesok=1");
+            redirect("$CFG->wwwroot/$CFG->admin/report/unittest/index.php?testtablesok=1");
         }
     } else {
         print_error('cannotcreateadminuser', 'debug');
@@ -6102,7 +6102,7 @@ class admin_setting_managerepository extends admin_setting {
         $addable = 0;
         foreach ($plugins as $p) {
             if (!in_array($p, $alreadyplugins)) {
-                $instancehtml .= '<li><a href="'.$CFG->wwwroot.'/admin/repository.php?sesskey='
+                $instancehtml .= '<li><a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/repository.php?sesskey='
                     .$USER->sesskey.'&amp;new='.$p.'">'.get_string('add', 'repository')
                     .' "'.get_string('repositoryname', 'repository_'.$p).'" '
                     .'</a></li>';

diff --git a/lib/portfoliolib.php b/lib/portfoliolib.php
index 24d4b1088c31e05f71b12297954e5d99514891a8..f7fdf8400e9c3e1956878389baadc9e56e1cc4b8 100644 (file)
--- a/lib/portfoliolib.php
+++ b/lib/portfoliolib.php
@@ -946,7 +946,7 @@ function portfolio_insane_notify_admins($insane, $instances=false) {
 
     $a = new StdClass;
     $a->sitename = $site->fullname;
-    $a->fixurl   = $CFG->wwwroot . '/admin/settings.php?section=manageportfolios';
+    $a->fixurl   = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageportfolios";
     $a->htmllist = portfolio_report_insane($insane, $instances, true);
     $a->textlist = '';
 

diff --git a/lib/simpletest/portfolio_testclass.php b/lib/simpletest/portfolio_testclass.php
index df570f114ec7d69f47d0f8fb46c19781f526aef2..7b45ce51da9a6049a6ba280142dfbdb2f622d2ae 100644 (file)
--- a/lib/simpletest/portfolio_testclass.php
+++ b/lib/simpletest/portfolio_testclass.php
@@ -35,8 +35,8 @@ if (!defined('MOODLE_INTERNAL')) {
     die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
 }
 
-require_once($CFG->libdir . '/portfoliolib.php');
-require_once($CFG->dirroot . '/admin/generator.php');
+require_once("$CFG->libdir/portfoliolib.php");
+require_once("$CFG->dirroot/$CFG->admin/generator.php");
 
 class portfolio_plugin_test extends portfolio_plugin_push_base {
     public function expected_time($callertime){
@@ -184,9 +184,6 @@ foreach ($portfolio_plugins as $plugin) {
     Mock::generatePartial("portfolio_plugin_$plugin", "partialmock_plugin_$plugin", array('send_package'));
 }
 
-require_once($CFG->libdir . '/portfoliolib.php');
-require_once($CFG->dirroot . '/admin/generator.php');
-
 class portfoliolib_test extends MoodleUnitTestCase {
 
     function setup() {

diff --git a/lib/simpletest/testrepositorylib.php b/lib/simpletest/testrepositorylib.php
index bb63c3456f620a548e113641e632b8f05f4ea755..d7e1a44cfdf2616371fb7491036ce7f17499b47f 100644 (file)
--- a/lib/simpletest/testrepositorylib.php
+++ b/lib/simpletest/testrepositorylib.php
@@ -35,8 +35,8 @@ if (!defined('MOODLE_INTERNAL')) {
     die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
 }
 
-require_once($CFG->dirroot . '/repository/lib.php');
-require_once($CFG->dirroot . '/admin/generator.php');
+require_once("$CFG->dirroot/repository/lib.php");
+require_once("$CFG->dirroot/$CFG->admin/generator.php");
 
 // Generate a mock class for each plugin subclass present
 $repository_plugins = get_list_of_plugins('repository');

diff --git a/lib/weblib.php b/lib/weblib.php
index 313132cb5cb45f7e7be74ad668fba81999b6c148..fac80a4a55dfbaae7b2c129c0dad310d6cd9e2af 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2465,7 +2465,7 @@ function print_header ($title='', $heading='', $navigation='', $focus='',
     }
 
     if (file_exists($CFG->dataroot.'/'.SITEID.'/maintenance.html')) {
-        $button = '<a href="'.$CFG->wwwroot.'/admin/maintenance.php">'.get_string('maintenancemode', 'admin').'</a> '.$button;
+        $button = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/maintenance.php">'.get_string('maintenancemode', 'admin').'</a> '.$button;
         if(!empty($title)) {
             $title .= ' - ';
         }

diff --git a/mod/assignment/simpletest/test_assignment_portfolio_callers.php b/mod/assignment/simpletest/test_assignment_portfolio_callers.php
index dd4a41de8486dd4289c45528f88aa772ab797edc..681daa5bdfebd360309afa05164dd1cdf57f5d96 100644 (file)
--- a/mod/assignment/simpletest/test_assignment_portfolio_callers.php
+++ b/mod/assignment/simpletest/test_assignment_portfolio_callers.php
@@ -1,7 +1,7 @@
 <?php // $Id$
-require_once($CFG->libdir.'/simpletest/portfolio_testclass.php');
-require_once($CFG->dirroot.'/mod/assignment/lib.php');
-require_once($CFG->dirroot.'/admin/generator.php');
+require_once("$CFG->libdir/simpletest/portfolio_testclass.php");
+require_once("$CFG->dirroot/mod/assignment/lib.php");
+require_once("$CFG->dirroot/$CFG->admin/generator.php");
 
 Mock::generate('assignment_portfolio_caller', 'mock_caller');
 Mock::generate('portfolio_exporter', 'mock_exporter');

diff --git a/mod/chat/simpletest/test_chat_portfolio_callers.php b/mod/chat/simpletest/test_chat_portfolio_callers.php
index 14e9565267d9e68112f3890f4fc2420bbc38dc25..6583e2281afe984e6f2aa139a9c445be5c356fee 100644 (file)
--- a/mod/chat/simpletest/test_chat_portfolio_callers.php
+++ b/mod/chat/simpletest/test_chat_portfolio_callers.php
@@ -1,7 +1,7 @@
 <?php // $Id$
-require_once($CFG->libdir.'/simpletest/portfolio_testclass.php');
-require_once($CFG->dirroot.'/mod/chat/lib.php');
-require_once($CFG->dirroot.'/admin/generator.php');
+require_once("$CFG->libdir/simpletest/portfolio_testclass.php");
+require_once("$CFG->dirroot/mod/chat/lib.php");
+require_once("$CFG->dirroot/$CFG->admin/generator.php");
 
 Mock::generate('chat_portfolio_caller', 'mock_caller');
 Mock::generate('portfolio_exporter', 'mock_exporter');

diff --git a/mod/data/simpletest/test_data_portfolio_callers.php b/mod/data/simpletest/test_data_portfolio_callers.php
index 5e4954e9e06f074c2b09663c53af181c494c49f4..8f1360cc1e6fdccb27ef514c517349321e896c1c 100644 (file)
--- a/mod/data/simpletest/test_data_portfolio_callers.php
+++ b/mod/data/simpletest/test_data_portfolio_callers.php
@@ -1,7 +1,7 @@
 <?php // $Id$
-require_once($CFG->libdir.'/simpletest/portfolio_testclass.php');
-require_once($CFG->dirroot.'/mod/data/lib.php');
-require_once($CFG->dirroot.'/admin/generator.php');
+require_once("$CFG->libdir/simpletest/portfolio_testclass.php");
+require_once("$CFG->dirroot.'/mod/data/lib.php");
+require_once("$CFG->dirroot/$CFG->admin/generator.php");
 
 Mock::generate('data_portfolio_caller', 'mock_caller');
 Mock::generate('portfolio_exporter', 'mock_exporter');

diff --git a/mod/forum/simpletest/test_forum_portfolio_callers.php b/mod/forum/simpletest/test_forum_portfolio_callers.php
index e741313c60f5675983307340da86596a89eddd72..ab53f35fd9eff5a5d39c38bd0a0ce22a641ed931 100644 (file)
--- a/mod/forum/simpletest/test_forum_portfolio_callers.php
+++ b/mod/forum/simpletest/test_forum_portfolio_callers.php
@@ -1,7 +1,7 @@
 <?php // $Id$
-require_once($CFG->libdir.'/simpletest/portfolio_testclass.php');
-require_once($CFG->dirroot.'/mod/forum/lib.php');
-require_once($CFG->dirroot.'/admin/generator.php');
+require_once("$CFG->libdir/simpletest/portfolio_testclass.php");
+require_once("$CFG->dirroot/mod/forum/lib.php");
+require_once("$CFG->dirroot/$CFG->admin/generator.php");
 
 Mock::generate('forum_portfolio_caller', 'mock_caller');
 Mock::generate('portfolio_exporter', 'mock_exporter');

diff --git a/mod/glossary/simpletest/test_glossary_portfolio_callers.php b/mod/glossary/simpletest/test_glossary_portfolio_callers.php
index c8f255eecb2465d5d62d1c6299a669de92275ddc..2ef4abf696f001c509e80eb4cd38ad241b1e1df5 100644 (file)
--- a/mod/glossary/simpletest/test_glossary_portfolio_callers.php
+++ b/mod/glossary/simpletest/test_glossary_portfolio_callers.php
@@ -1,7 +1,7 @@
 <?php // $Id$
-require_once($CFG->libdir.'/simpletest/portfolio_testclass.php');
-require_once($CFG->dirroot.'/mod/glossary/lib.php');
-require_once($CFG->dirroot.'/admin/generator.php');
+require_once("$CFG->libdir/simpletest/portfolio_testclass.php");
+require_once("$CFG->dirroot/mod/glossary/lib.php");
+require_once("$CFG->dirroot/$CFG->admin/generator.php");
 
 Mock::generate('glossary_entry_portfolio_caller', 'mock_entry_caller');
 Mock::generate('glossary_csv_portfolio_caller', 'mock_csv_caller');

diff --git a/mod/resource/simpletest/test_resource_portfolio_callers.php b/mod/resource/simpletest/test_resource_portfolio_callers.php
index 1ad23ca76702952310d15820de4ef9712f5a9cda..c46209593638c3f8b13918e0deddeb9c54b05863 100644 (file)
--- a/mod/resource/simpletest/test_resource_portfolio_callers.php
+++ b/mod/resource/simpletest/test_resource_portfolio_callers.php
@@ -1,7 +1,7 @@
 <?php // $Id$
-require_once($CFG->libdir.'/simpletest/portfolio_testclass.php');
-require_once($CFG->dirroot.'/mod/resource/lib.php');
-require_once($CFG->dirroot.'/admin/generator.php');
+require_once("$CFG->libdir/simpletest/portfolio_testclass.php");
+require_once("$CFG->dirroot/mod/resource/lib.php");
+require_once("$CFG->dirroot/$CFG->admin/generator.php");
 
 Mock::generate('resource_portfolio_caller', 'mock_caller');
 Mock::generate('portfolio_exporter', 'mock_exporter');

diff --git a/portfolio/type/boxnet/simpletest/testportfoliopluginboxnet.php b/portfolio/type/boxnet/simpletest/testportfoliopluginboxnet.php
index e396bbebc2d3dfca8de5c39bc5f98e459e3f28e7..b9116dbbd5196fd20798808eae3e41980cab15f0 100644 (file)
--- a/portfolio/type/boxnet/simpletest/testportfoliopluginboxnet.php
+++ b/portfolio/type/boxnet/simpletest/testportfoliopluginboxnet.php
@@ -1,7 +1,7 @@
 <?php // $Id$
-require_once($CFG->libdir.'/simpletest/testportfoliolib.php');
-require_once($CFG->dirroot.'/portfolio/type/boxnet/lib.php');
-require_once($CFG->dirroot.'/admin/generator.php');
+require_once("$CFG->libdir/simpletest/testportfoliolib.php");
+require_once("$CFG->dirroot/portfolio/type/boxnet/lib.php");
+require_once("$CFG->dirroot/$CFG->admin/generator.php");
 
 Mock::generate('boxclient', 'mock_boxclient');
 Mock::generatePartial('portfolio_plugin_boxnet', 'mock_boxnetplugin', array('ensure_ticket', 'ensure_account_tree'));

diff --git a/repository/lib.php b/repository/lib.php
index f99127cbc67aed4638eac935d1e84129a08078ef..19c4e872d068b445aa269f51c980a2dc52bb74e2 100644 (file)
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -978,7 +978,7 @@ abstract class repository {
         //if the context is SYSTEM, so we call it from administration page
         $admin = ($context->id == SYSCONTEXTID) ? true : false;
         if ($admin) {
-            $baseurl = $CFG->httpswwwroot . '/admin/repositoryinstance.php?sesskey=' . sesskey();
+            $baseurl = "$CFG->httpswwwroot/$CFG->admin/repositoryinstance.php?sesskey=" . sesskey();
             $output .= "<div ><h2 style='text-align: center'>" . get_string('siteinstances', 'repository') . " ";
             $output .= "</h2></div>";
         } else {