From: gbateson Date: Fri, 4 May 2007 02:53:52 +0000 (+0000) Subject: remove duplicate id attribute from body tag; microincrement version to 2007040200... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=111a18ebf33939a54a953a1e8688262bc537ed84;p=moodle.git remove duplicate id attribute from body tag; microincrement version to 2007040200 (release 2.4.2) --- diff --git a/mod/hotpot/README.TXT b/mod/hotpot/README.TXT index 32ff96a2c0..8c8d2abf4a 100644 --- a/mod/hotpot/README.TXT +++ b/mod/hotpot/README.TXT @@ -1,5 +1,5 @@ ================================================== -This is v2.4.1 of the HotPot module for Moodle 1.9 +This is v2.4.2 of the HotPot module for Moodle 1.9 ================================================== This module allows teachers to administer Hot Potatoes and TexToys quizzes via Moodle. @@ -33,11 +33,11 @@ IMPORTANT NOTICE TO INSTALL OR UPDATE THE HOTPOT MODULE ====================================== - You should install only this module by installing a complete Moodle 1.8 package. + You should install only this module by installing a complete Moodle 1.9 package. Similarly, the recommended way to upgrade this module is to upgrade to a complete Moodle 1.8 package. - However, it is possible to download and unzip a complete Moodle 1.8 package and extract the "mod/hotpot" folder for use on your live Moodle 1.8 site. + However, it is possible to download and unzip a complete Moodle 1.9 package and extract the "mod/hotpot" folder for use on your live Moodle 1.8 site. ======================== TO USE THE HOTPOT MODULE diff --git a/mod/hotpot/version.php b/mod/hotpot/version.php index 19cdce0103..172f5be74b 100644 --- a/mod/hotpot/version.php +++ b/mod/hotpot/version.php @@ -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.4.1'; // human-friendly version name (used in mod/hotpot/lib.php) +$module->version = 2007040200; // release date of this version (see note below) +$module->release = 'v2.4.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 diff --git a/mod/hotpot/view.php b/mod/hotpot/view.php index 9d2f3b4778..9ec4861c1b 100644 --- a/mod/hotpot/view.php +++ b/mod/hotpot/view.php @@ -261,6 +261,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 tag $head = ''; $pattern = '|]*)>(.*?)|is'; @@ -275,7 +281,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); } } @@ -285,7 +293,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); } } @@ -296,7 +306,9 @@ // HP6 and some HP5 (v6 and v4) if (preg_match('|]*'.'onLoad=(["\'])(.*?)(\\2)'.'[^>]*)'.'>(.*)|is', $hp->html, $matches)) { $body = $matches[5]; // contents of first ... 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 tag // if it is included in the theme/$CFG->theme/header.html,