# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
Index: moodle/admin/settings/appearance.php
--- moodle/admin/settings/appearance.php Base (1.66)
+++ moodle/admin/settings/appearance.php Locally Modified (Based On 1.66)
@@ -17,7 +17,6 @@
$temp->add(new admin_setting_configcheckbox('allowthemechangeonurl', get_string('allowthemechangeonurl', 'admin'), get_string('configallowthemechangeonurl', 'admin'), 0));
$temp->add(new admin_setting_configcheckbox('allowuserblockhiding', get_string('allowuserblockhiding', 'admin'), get_string('configallowuserblockhiding', 'admin'), 1));
$temp->add(new admin_setting_configcheckbox('allowblockstodock', get_string('allowblockstodock', 'admin'), get_string('configallowblockstodock', 'admin'), 1));
- $temp->add(new admin_setting_configcheckbox('showblocksonmodpages', get_string('showblocksonmodpages', 'admin'), get_string('configshowblocksonmodpages', 'admin'), 0));
$temp->add(new admin_setting_configtextarea('custommenuitems', get_string('custommenuitems', 'admin'), get_string('configcustommenuitems', 'admin'), '', PARAM_TEXT, '50', '10'));
$ADMIN->add('themes', $temp);
$ADMIN->add('themes', new admin_externalpage('themeselector', get_string('themeselector','admin'), $CFG->wwwroot . '/theme/index.php'));
Index: moodle/backup/backuplib.php
--- moodle/backup/backuplib.php Base (1.252)
+++ moodle/backup/backuplib.php Locally Modified (Based On 1.252)
@@ -991,11 +991,11 @@
$pages = array();
$pages[] = page_create_object(PAGE_COURSE_VIEW, $preferences->backup_course);
- if (!empty($CFG->showblocksonmodpages)) {
// get course structure
$course = $DB->get_record('course', array('id'=>$preferences->backup_course));
$modinfo =& get_fast_modinfo($course);
+ // backup blocks on mod pages.
foreach($preferences->mods as $module) {
if (!$module->backup) {
continue;
@@ -1018,7 +1018,6 @@
}
}
}
- }
//Blocks open tag
fwrite ($bf,start_tag('BLOCKS',2,true));
Index: moodle/backup/restorelib.php
--- moodle/backup/restorelib.php Base (1.420)
+++ moodle/backup/restorelib.php Locally Modified (Based On 1.420)
@@ -1238,7 +1238,8 @@
// This one's easy...
$instance->pageid = $restore->course_id;
- } else if (!empty($CFG->showblocksonmodpages)) {
+ } else {
+ // restore activity blocks
$parts = explode('-', $instance->pagetype);
if($parts[0] == 'mod') {
if(!$restore->mods[$parts[1]]->restore) {
@@ -1257,9 +1258,6 @@
continue;
}
- } else {
- // do not restore activity blocks if disabled
- continue;
}
if(!isset($pageinstances[$instance->pagetype])) {
Index: moodle/lang/en/admin.php
--- moodle/lang/en/admin.php Base (1.116)
+++ moodle/lang/en/admin.php Locally Modified (Based On 1.116)
@@ -316,7 +316,6 @@
$string['configsessioncookiedomain'] = 'This allows you to change the domain that the Moodle cookies are available from. This is useful for Moodle customisations (e.g. authentication or enrolment plugins) that need to share Moodle session information with a web application on another subdomain. WARNING: it is strongly recommended to leave this setting at the default (empty) - an incorrect value will prevent all logins to the site.';
$string['configsessioncookiepath'] = 'If you need to change where browsers send the Moodle cookies, you can change this setting to specify a subdirectory of your web site. Otherwise the default \'/\' should be fine.';
$string['configsessiontimeout'] = 'If people logged in to this site are idle for a long time (without loading pages) then they are automatically logged out (their session is ended). This variable specifies how long this time should be.';
-$string['configshowblocksonmodpages'] = 'Some activity modules support blocks on their pages. If you turn this on, then teachers will be able to add side blocks on those pages, otherwise the interface does not show this feature.';
$string['configshowcommentscount'] = 'Show comments count, it will cost one more query when display comments link';
$string['configshowsiteparticipantslist'] = 'All of these site students and site teachers will be listed on the site participants list. Who shall be allowed to see this site participants list?';
$string['configsitedefaultlicense'] = 'Default site license';
@@ -871,7 +870,6 @@
$string['settingfileuploads'] = 'File uploading is required for normal operation, please enable it in PHP configuration.';
$string['settingmemorylimit'] = 'Insufficient memory detected, please set higher memory limit in PHP settings.';
$string['settingsafemode'] = 'Moodle is not fully compatible with safe mode, please ask server administrator to turn it off. Running Moodle under safe mode is not supported, please expect various problems if you do so.';
-$string['showblocksonmodpages'] = 'Show blocks on module pages';
$string['showcommentscount'] = 'Show comments count';
$string['showdetails'] = 'Show details';
$string['simpletest'] = 'Unit tests';
Index: moodle/lib/pagelib.php
--- moodle/lib/pagelib.php Base (1.185)
+++ moodle/lib/pagelib.php Locally Modified (Based On 1.185)
@@ -1733,7 +1733,7 @@
}
$buttons = '