Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed in #128, this pull request deals with 2 issues:
The
html_head_setup_info()
function inclasses/url_rewriter.php
contains$me = new moodle_url($ME)
, which prepends the Moodle directory (the path portion of$CFG->wwwroot
) to$me
.$ME
already has the Moodle directory as a prefix, so that is why the Moodle directory ends up appearing twice (e.g. http://www.example.com/moodle/moodle). Consequently,$me
doesn't get the correct clean URL path.The fix involves checking for the Moodle directory (specifically, the path portion of
$CFG->wwwroot
) in$ME
. If present, remove it.I've added a unit test in
url_rewriter_html_head_setup_test.php
for the following cases:(e.g. http://www.example.com/moodle/course/view.php?id=5)
(e.g. http://www.example.com/moodle/user/?id=5)
(e.g. http://www.example.com/moodle/user/index.php?id=5)
(e.g. http://www.example.com/moodle/course/?categoryid=2)
(e.g. http://www.example.com/moodle/course/index.php?categoryid=2)
(e.g. http://www.example.com/moodle/mod/page/?id=5)
(e.g. http://www.example.com/moodle/mod/page/index.php?id=5)
(e.g. http://www.example.com/moodle/mod/page/view.php?id=9)
(e.g. http://www.example.com/moodle/user/profile.php?id=11)