L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove duplicate id attribute from body tag; microincrement version to 2007020202 (release 2.3.2)

Browse Source
This commit is contained in:
gbateson
2007-05-04 02:50:18 +00:00
parent 66eefc5b26
commit 3cb6bd2c35
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/hotpot/README.TXT
+1 -1
View File
@@ -1,5 +1,5 @@
==================================================
This is v2.3.1 of the HotPot module for Moodle 1.8
This is v2.3.2 of the HotPot module for Moodle 1.8
==================================================
This module allows teachers to administer Hot Potatoes and TexToys quizzes via Moodle.
mod/hotpot/version.php
+2 -2
View File
@@ -3,8 +3,8 @@
/// Code fragment to define the version of hotpot
/// This fragment is called by moodle_needs_upgrading() and /admin/index.php
/////////////////////////////////////////////////////////////////////////////////
$module->version = 2007020201; // release date of this version (see note below)
$module->release = 'v2.3.1'; // human-friendly version name (used in mod/hotpot/lib.php)
$module->version = 2007020202; // release date of this version (see note below)
$module->release = 'v2.3.2'; // human-friendly version name (used in mod/hotpot/lib.php)
$module->requires = 2007020200; // Requires this Moodle version
$module->cron = 0; // period for cron to check this module (secs)
// interpretation of YYYYMMDDXY version numbers
mod/hotpot/view.php
+15 -3
View File
@@ -260,6 +260,12 @@
}
// insert hot-potatoes.js
$hp->insert_script(HOTPOT_JS);
// get Moodle pageid and pageclass
$pageid = '';
$pageclass = '';
if (function_exists('page_id_and_class')) {
page_id_and_class($pageid, $pageclass);
}
// extract first <head> tag
$head = '';
$pattern = '|<head([^>]*)>(.*?)</head>|is';
@@ -274,7 +280,9 @@
if (preg_match_all($pattern, $head, $matches)) {
$count = count($matches[0]);
for ($i=0; $i<$count; $i++) {
$styles .= $matches[0][$i]."\n";
if ($pageid) {
$styles .= str_replace('TheBody', $pageid, $matches[0][$i])."\n";
}
$head = str_replace($matches[0][$i], '', $head);
}
}
@@ -284,7 +292,9 @@
if (preg_match_all($pattern, $head, $matches)) {
$count = count($matches[0]);
for ($i=0; $i<$count; $i++) {
$scripts .= $matches[0][$i]."\n";
if ($pageid) {
$scripts .= str_replace('TheBody', $pageid, $matches[0][$i])."\n";
}
$head = str_replace($matches[0][$i], '', $head);
}
}
@@ -295,7 +305,9 @@
// HP6 and some HP5 (v6 and v4)
if (preg_match('|<body'.'([^>]*'.'onLoad=(["\'])(.*?)(\\2)'.'[^>]*)'.'>(.*)</body>|is', $hp->html, $matches)) {
$body = $matches[5]; // contents of first <body onload="StartUp()">...</body> block
$body_tags = $matches[1];
if ($pageid) {
$body_tags = str_replace(' id="TheBody"', '', $matches[1]);
}
// workaround to ensure javascript onload routine for quiz is always executed
// $body_tags will only be inserted into the <body ...> tag
// if it is included in the theme/$CFG->theme/header.html,