moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-47073-master' of git://github.com/junpataleta/moodle

Browse source
This commit is contained in:
Andrew Nicols 2015-11-02 11:54:21 +08:00
commit df8095156e
2 changed files with 40 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/outputrequirementslib.php
View file

@ -556,6 +556,8 @@ class page_requirements_manager {
$path = realpath("$componentdir/jquery/$file"); $path = realpath("$componentdir/jquery/$file");
if (strpos($path, $CFG->dirroot) === 0) { if (strpos($path, $CFG->dirroot) === 0) {
$url = $CFG->httpswwwroot.preg_replace('/^'.preg_quote($CFG->dirroot, '/').'/', '', $path); $url = $CFG->httpswwwroot.preg_replace('/^'.preg_quote($CFG->dirroot, '/').'/', '', $path);
// Replace all occurences of backslashes characters in url to forward slashes.
$url = str_replace('\\', '/', $url);
$url = new moodle_url($url); $url = new moodle_url($url);
} else { } else {
// Bad luck, fix your server! // Bad luck, fix your server!

38
lib/tests/outputrequirementslib_test.php
View file

@ -63,4 +63,42 @@ class core_outputrequirementslib_testcase extends advanced_testcase {
$this->assertTrue($secondpage->requires->should_create_one_time_item_now('test_item')); $this->assertTrue($secondpage->requires->should_create_one_time_item_now('test_item'));
} }
/**
* Test for the jquery_plugin method.
*
* Test to make sure that backslashes are not generated with either slasharguments set to on or off.
*/
public function test_jquery_plugin() {
global $CFG;
$this->resetAfterTest();
// With slasharguments on.
$CFG->slasharguments = 1;
$page = new moodle_page();
$requirements = $page->requires;
// Assert successful method call.
$this->assertTrue($requirements->jquery_plugin('jquery'));
$this->assertTrue($requirements->jquery_plugin('ui'));
// Get the code containing the required jquery plugins.
$requirecode = $requirements->get_top_of_body_code();
// Make sure that the generated code does not contain backslashes.
$this->assertFalse(strpos($requirecode, '\\'), "Output contains backslashes: " . $requirecode);
// With slasharguments off.
$CFG->slasharguments = 0;
$page = new moodle_page();
$requirements = $page->requires;
// Assert successful method call.
$this->assertTrue($requirements->jquery_plugin('jquery'));
$this->assertTrue($requirements->jquery_plugin('ui'));
// Get the code containing the required jquery plugins.
$requirecode = $requirements->get_top_of_body_code();
// Make sure that the generated code does not contain backslashes.
$this->assertFalse(strpos($requirecode, '\\'), "Output contains backslashes: " . $requirecode);
}
} }